Commit Graph

90693 Commits

Author SHA1 Message Date
Automerger Merge Worker
f0ad262500 Merge "[automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc -s ours am: 76545f383c -s ours am: 60beadd631 -s ours am: 5be8bd29f5 -s ours" into sc-v2-dev-plus-aosp 2021-06-28 06:57:56 +00:00
Hugh Chen
404673bd0f [automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc -s ours am: 76545f383c -s ours am: 60beadd631 -s ours am: 5be8bd29f5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021913

Change-Id: I9ac5d2619013700a66f5e99a3ef634806995fa6a
2021-06-28 06:57:54 +00:00
Hugh Chen
5a7bbbfa85 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours am: 3fcb9c9811 -s ours am: 0cfe42b287 -s ours am: 49d4c89944 -s ours am: 985d52d0c6 -s ours am: 4d49ac0837 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918

Change-Id: Ifacdbf2091f2ee66e04ba37344e53685941168bc
2021-06-28 06:57:53 +00:00
Hugh Chen
477662c593 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours am: 3fcb9c9811 -s ours am: 0cfe42b287 -s ours am: c6362e92e8 -s ours am: c87b09a9c4 -s ours am: e1bb996e34 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918

Change-Id: Icbc32efd801de6a0938bb91b7ba3c04275b6c710
2021-06-28 06:57:51 +00:00
Hugh Chen
01a30c0e6b [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours am: 367921a80d -s ours am: f41af1a1e3 -s ours am: eb41b62299 -s ours am: ecfff8b79b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139

Change-Id: Ib167bfab51e0b122b38372295a4f26c9e7676874
2021-06-28 06:57:49 +00:00
Hugh Chen
6133962b76 [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours am: 367921a80d -s ours am: 3f2394bbc7 -s ours am: 5a9f761f75 -s ours am: 41ebb82478 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139

Change-Id: I1562d647247085b1faf101f5a5918b0f9e1a7fe2
2021-06-28 06:57:46 +00:00
Hugh Chen
1649b3f464 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01 am: d351303e36 -s ours am: 499cfe303f -s ours am: 48ceb503d8 -s ours am: 7f4a301b88 -s ours am: b03a49d16e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917

Change-Id: I8716dd6adb96097bb5b0f0982fb55804134c3e6c
2021-06-28 06:57:44 +00:00
Hugh Chen
ad5e2197f6 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01 am: d351303e36 -s ours am: 499cfe303f -s ours am: a539c36421 -s ours am: b42ecba8a3 -s ours am: 02d5bf38f2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917

Change-Id: I75996ed76dad8e5fe68c2b5733f7554d8180f8d0
2021-06-28 06:57:42 +00:00
Hugh Chen
6549264957 [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours am: 4c2b189379 -s ours am: 3e51c20e21 -s ours am: f047ed0a50 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137

Change-Id: I29252042dbe97f82e209143df212fa6ca2d95bbe
2021-06-28 06:57:39 +00:00
Hugh Chen
78966b57ba [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours am: dbcebc42bf -s ours am: 8b9dbd066a -s ours am: 335ff2723c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137

Change-Id: I4c684c0a8a9a8f2b36520f4f003d15457a371c83
2021-06-28 06:57:37 +00:00
Hugh Chen
2a2a81dea5 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours am: b8aa9ad04d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141

Change-Id: I7d2147f3fc8860e58a4d8cb4e15eb4b09d000c9c
2021-06-28 06:57:36 +00:00
Hugh Chen
02746116b3 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a am: bee2daea18 -s ours am: ff719d5bd8 -s ours am: 4695948372 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021915

Change-Id: I69bce123d4a542f85e37cada1aecea268b1030fc
2021-06-28 06:57:35 +00:00
Hugh Chen
064bf9dd81 [automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140

Change-Id: I92ba93b2dccd7fd440b303c241c564af03721944
2021-06-28 06:57:32 +00:00
Hugh Chen
699da2c88d [automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc -s ours am: 76545f383c -s ours am: 60beadd631 -s ours am: 0826507b60 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021913

Change-Id: I0af1d800dee054f9d04d4122fff3f82f7531e1c6
2021-06-28 06:57:32 +00:00
Hugh Chen
b57f71fa58 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours am: 3fcb9c9811 -s ours am: 0cfe42b287 -s ours am: 49d4c89944 -s ours am: 985d52d0c6 -s ours am: aa2cd3d549 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918

Change-Id: If9f3fd9ddf67bc05eacd8df4ea80c49cca724d94
2021-06-28 06:57:32 +00:00
Hugh Chen
a179cd8705 [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours am: 367921a80d -s ours am: f41af1a1e3 -s ours am: eb41b62299 -s ours am: df19a50772 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139

Change-Id: I80701878dac6f5e299733fb8247e2786921f1634
2021-06-28 06:57:27 +00:00
Hugh Chen
a531e96867 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours am: 3fcb9c9811 -s ours am: 0cfe42b287 -s ours am: c6362e92e8 -s ours am: c87b09a9c4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918

Change-Id: I92d5987902f1422630b48d2e4d7a01fba9c3339f
2021-06-28 06:57:22 +00:00
Hugh Chen
b68fb9d420 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01 am: d351303e36 -s ours am: 499cfe303f -s ours am: 48ceb503d8 -s ours am: 7f4a301b88 -s ours am: c5a321e1d8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917

Change-Id: Ib61edda4a34a8e0e538ee0918967d96f9a5480a4
2021-06-28 06:57:22 +00:00
Hugh Chen
e1bb996e34 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours am: 3fcb9c9811 -s ours am: 0cfe42b287 -s ours am: c6362e92e8 -s ours am: c87b09a9c4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918

Change-Id: I27bc3f30f6a2ad1c5bde42ded127e2f5efafea77
2021-06-28 06:57:20 +00:00
Hugh Chen
1913f6d881 [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours am: 367921a80d -s ours am: 3f2394bbc7 -s ours am: 5a9f761f75 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139

Change-Id: I660ac34a94f84213c1e631be087aea15e839802b
2021-06-28 06:57:18 +00:00
Hugh Chen
9f05146b0c [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours am: 4c2b189379 -s ours am: 3e51c20e21 -s ours am: 83135eb2da -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137

Change-Id: I138f219e5fe5593a25d3cf4221550b317674a1cd
2021-06-28 06:57:17 +00:00
Hugh Chen
41ebb82478 [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours am: 367921a80d -s ours am: 3f2394bbc7 -s ours am: 5a9f761f75 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139

Change-Id: I7d4dcee538fa02b732d3164340dce166f689dc04
2021-06-28 06:57:16 +00:00
Hugh Chen
02d5bf38f2 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01 am: d351303e36 -s ours am: 499cfe303f -s ours am: a539c36421 -s ours am: b42ecba8a3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917

Change-Id: I008b474928c6cf8765e194d12b364f15cb5e8854
2021-06-28 06:57:12 +00:00
Hugh Chen
ab51d1dea3 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a am: bee2daea18 -s ours am: ff719d5bd8 -s ours am: 473aaac602 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021915

Change-Id: I9f6287e14586ecc2ff26a80e7b07f8d03c52da2b
2021-06-28 06:57:12 +00:00
Hugh Chen
e3db867566 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01 am: d351303e36 -s ours am: 499cfe303f -s ours am: a539c36421 -s ours am: b42ecba8a3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917

Change-Id: I4a6f95c49f93bf8de6e0f6a4bcb377775bc5a60c
2021-06-28 06:57:08 +00:00
Hugh Chen
335ff2723c [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours am: dbcebc42bf -s ours am: 8b9dbd066a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137

Change-Id: I40c1743bd17ff400b21693de002385be21c0a01e
2021-06-28 06:57:08 +00:00
Hugh Chen
e5433adfb9 [automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc -s ours am: 76545f383c -s ours am: 60beadd631 -s ours am: f7075e3920 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021913

Change-Id: I1eb7806fd9044f8f8595e3198cb84996dea87a28
2021-06-28 06:57:08 +00:00
Hugh Chen
ff009f3645 [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours am: dbcebc42bf -s ours am: 8b9dbd066a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137

Change-Id: I81a67c2d54ca443a75da49bccc5ba57e295b5d16
2021-06-28 06:56:57 +00:00
Hugh Chen
c87b09a9c4 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours am: 3fcb9c9811 -s ours am: 0cfe42b287 -s ours am: c6362e92e8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918

Change-Id: Ice6e60ffb90eb289b8a90e57acf0e48c07399d44
2021-06-28 06:52:22 +00:00
Hugh Chen
5a9f761f75 [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours am: 367921a80d -s ours am: 3f2394bbc7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139

Change-Id: I54e4dc25694f503c3d4a48071929abc61be5ad6a
2021-06-28 06:52:18 +00:00
Hugh Chen
b42ecba8a3 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01 am: d351303e36 -s ours am: 499cfe303f -s ours am: a539c36421 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917

Change-Id: I8b5ed14819b9919e4bc3781220929b9ebeb858d2
2021-06-28 06:52:13 +00:00
Hugh Chen
8b9dbd066a [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours am: dbcebc42bf -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137

Change-Id: Id00a69e04103f387d0920a628222b5aeff3a3f5d
2021-06-28 06:52:08 +00:00
Hugh Chen
4a28e41cb1 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a am: a11ed686d4 -s ours am: bc51750bf1 -s ours am: a0446cb1cc -s ours am: 35da7c1b5d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021915

Change-Id: Idde4878d4392c177e59d8851045a8955b53c70f1
2021-06-28 06:49:31 +00:00
Hugh Chen
37a75671b0 [automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc am: 91d5f08e39 -s ours am: 9eef0e089d -s ours am: 09a4146c6c -s ours am: 338d115f4c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021913

Change-Id: I4dcf3fc312653318e7c453260f2b20434ac79f30
2021-06-28 06:49:26 +00:00
TreeHugger Robot
facb5e5369 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into rvc-qpr-dev am: 9c105d911a -s ours am: 85524a7276 -s ours am: 5af1f843fd -s ours am: fc2e7d4972 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021916

Change-Id: Ib4b8fdf8b309bac94335d7786a9098ddc3be2953
2021-06-28 06:49:22 +00:00
TreeHugger Robot
6aa426a59f [automerger skipped] Merge "RESTRICT AUTOMERGE Update string" into rvc-qpr-dev am: b2b280a67a -s ours am: 1c6594bcd4 -s ours am: 29a15a436d -s ours am: f63e2d4a3c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016136

Change-Id: Ibe780be19507a1903e211ee24624acd0672bdd74
2021-06-28 06:49:17 +00:00
Hugh Chen
cb330f965e [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a am: a11ed686d4 -s ours am: bc51750bf1 -s ours am: e08ce43503 -s ours am: 769c6a42f6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021915

Change-Id: I920bd7f29c9829818f39674dce6a196355d4ae82
2021-06-28 06:49:12 +00:00
Hugh Chen
73798ac4e0 [automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc am: 91d5f08e39 -s ours am: 9eef0e089d -s ours am: c731fef485 -s ours am: ff0366097f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021913

Change-Id: I7e5db6283f375d6fd0bba7424288b9e3a2d91950
2021-06-28 06:49:07 +00:00
TreeHugger Robot
a793b1eca6 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into rvc-qpr-dev am: 9c105d911a -s ours am: 85524a7276 -s ours am: 1755199030 -s ours am: 844dbfe611 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021916

Change-Id: Ibcdec956ba920c52e12330c7a98c71f13b2c4a19
2021-06-28 06:49:01 +00:00
Hugh Chen
4d49ac0837 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours am: 3fcb9c9811 -s ours am: 0cfe42b287 -s ours am: 49d4c89944 -s ours am: 985d52d0c6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918

Change-Id: I336e4f83f9f420a7d836a5f99fa4fe0ea9ed022d
2021-06-28 06:48:55 +00:00
Hugh Chen
ecfff8b79b [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours am: 367921a80d -s ours am: f41af1a1e3 -s ours am: eb41b62299 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139

Change-Id: I4554d36ccd68b745d89510355d603db8c21c99b3
2021-06-28 06:48:51 +00:00
Hugh Chen
b03a49d16e [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01 am: d351303e36 -s ours am: 499cfe303f -s ours am: 48ceb503d8 -s ours am: 7f4a301b88 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917

Change-Id: Id555101d62269b28fa0f8fbfd636f3212824d03c
2021-06-28 06:48:47 +00:00
Hugh Chen
f047ed0a50 [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours am: 4c2b189379 -s ours am: 3e51c20e21 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137

Change-Id: Ibce4e5f127501d883fcf198bd4d5799880c56993
2021-06-28 06:48:44 +00:00
Hugh Chen
4695948372 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a am: bee2daea18 -s ours am: ff719d5bd8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021915

Change-Id: I2a1613222b6ea6a555645322d1f2ab14f6b78235
2021-06-28 06:48:40 +00:00
Hugh Chen
0826507b60 [automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc -s ours am: 76545f383c -s ours am: 60beadd631 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021913

Change-Id: I829135ca573638995c6319ffbc4418bba84affc4
2021-06-28 06:48:37 +00:00
TreeHugger Robot
c18ddb8e22 [automerger skipped] Merge "RESTRICT AUTOMERGE Update string" into rvc-qpr-dev am: b2b280a67a -s ours am: 1c6594bcd4 -s ours am: 28db630560 -s ours am: fb6ccab9b2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016136

Change-Id: I13874ef80b9480af31d276f5dc98acb1ced14346
2021-06-28 06:48:17 +00:00
Hugh Chen
aa2cd3d549 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours am: 3fcb9c9811 -s ours am: 0cfe42b287 -s ours am: 49d4c89944 -s ours am: 985d52d0c6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918

Change-Id: Ief541023b30b0bf82ea24a88a56fbcf105efe58f
2021-06-28 06:48:15 +00:00
Hugh Chen
3cf157ae14 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours am: 3fcb9c9811 -s ours am: 0cfe42b287 -s ours am: 49d4c89944 -s ours am: 985d52d0c6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918

Change-Id: I4f8195fa85f098d5858434f21ea6e3d731700ce0
2021-06-28 06:48:11 +00:00
Hugh Chen
df19a50772 [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours am: 367921a80d -s ours am: f41af1a1e3 -s ours am: eb41b62299 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139

Change-Id: Idc611edc40ba22163c587e5a4ac8d16e36cbe568
2021-06-28 06:48:07 +00:00
Hugh Chen
8c3fcb589c [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours am: 367921a80d -s ours am: f41af1a1e3 -s ours am: eb41b62299 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139

Change-Id: I521e85bfff16d49006290134ce341e73959227e1
2021-06-28 06:48:06 +00:00