Commit Graph

90550 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
c5a321e1d8 [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: I55de3b3960c5034bd85d8dd3d24c54d723587607
2021-06-28 06:48:03 +00:00
Hugh Chen
83135eb2da [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: Icaaea12d557a64e6de462fa5f0ad53d070fb189f
2021-06-28 06:47:59 +00:00
Hugh Chen
473aaac602 [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: I556184532aedfbbfec2fa7f98a9874c269797408
2021-06-28 06:47:56 +00:00
Hugh Chen
f7075e3920 [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: I86ce815698e562b8c03f815018fa3c839d711686
2021-06-28 06:47:52 +00:00
Hugh Chen
985d52d0c6 [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 skip reason: subject contains skip directive

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

Change-Id: Ice63058d24150556d6b93398c1ca2f5dc76afc08
2021-06-28 06:42:26 +00:00
Hugh Chen
eb41b62299 [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 skip reason: subject contains skip directive

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

Change-Id: I04479e17813fe34299739d0ba235a9cc711bf0b2
2021-06-28 06:42:22 +00:00
Hugh Chen
7f4a301b88 [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 skip reason: subject contains skip directive

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

Change-Id: Id62683035962b0c8df55c61fb574c5e86025ad06
2021-06-28 06:42:17 +00:00
Hugh Chen
3e51c20e21 [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours am: 4c2b189379 -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: Ibe216a5f6ac77ae34c00eaf915c34397833fd71d
2021-06-28 06:42:13 +00:00
Hugh Chen
35da7c1b5d [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 skip reason: subject contains skip directive

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

Change-Id: If6331e5b22ed04905e50f6812ca1d665860fc53d
2021-06-28 06:37:56 +00:00
Hugh Chen
338d115f4c [automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc am: 91d5f08e39 -s ours am: 9eef0e089d -s ours am: 09a4146c6c -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: I9466b5f9ee8d9beeb3ab1d7866e09c36e9b4ee68
2021-06-28 06:37:52 +00:00
Hugh Chen
49d4c89944 [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 skip reason: subject contains skip directive

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

Change-Id: I19651eae9672ae29ed50c9b795626b49d062f557
2021-06-28 06:37:50 +00:00
TreeHugger Robot
fc2e7d4972 [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 skip reason: subject contains skip directive

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

Change-Id: I7d55d6194c47818b0b20a2d7e0276596205366e1
2021-06-28 06:37:48 +00:00
Hugh Chen
f41af1a1e3 [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours am: 367921a80d -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: If1c2a27ab396564127b1bd4d2030ff0a308d9fee
2021-06-28 06:37:47 +00:00
TreeHugger Robot
f63e2d4a3c [automerger skipped] Merge "RESTRICT AUTOMERGE Update string" into rvc-qpr-dev am: b2b280a67a -s ours am: 1c6594bcd4 -s ours am: 29a15a436d -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: Ibdc0f69ba63b9633195fc7c45e60c94924c4cdea
2021-06-28 06:37:41 +00:00
Hugh Chen
48ceb503d8 [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 skip reason: subject contains skip directive

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

Change-Id: I245db30a5d520b326015747008037cfaf9f10351
2021-06-28 06:37:37 +00:00
Hugh Chen
4c2b189379 [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -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: I8d51b562c0610f609892dd56fe81d70edbbf4109
2021-06-28 06:37:33 +00:00
Hugh Chen
769c6a42f6 [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 skip reason: subject contains skip directive

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

Change-Id: I51ddc307c22adb07d35aa9382d34354afef13b60
2021-06-28 06:37:09 +00:00
Hugh Chen
ff0366097f [automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc am: 91d5f08e39 -s ours am: 9eef0e089d -s ours am: c731fef485 -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: I3acdc2f9861fdd66c83f210836bb3bbc31704804
2021-06-28 06:37:05 +00:00
Hugh Chen
a539c36421 [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 skip reason: subject contains skip directive

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

Change-Id: I60bd575da426261bfcd112ac4b69d4efe15c6ad2
2021-06-28 06:37:04 +00:00
TreeHugger Robot
844dbfe611 [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 skip reason: subject contains skip directive

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

Change-Id: I93258fc60a1e542b80a3abd1f88f7c4fbfaa977b
2021-06-28 06:37:02 +00:00
Hugh Chen
dbcebc42bf [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -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: Icd57778b71e3ff3f2300fdd0f335373bd7fce4cd
2021-06-28 06:37:00 +00:00
TreeHugger Robot
fb6ccab9b2 [automerger skipped] Merge "RESTRICT AUTOMERGE Update string" into rvc-qpr-dev am: b2b280a67a -s ours am: 1c6594bcd4 -s ours am: 28db630560 -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: I9740cd5e62fea3eaeba184ccba77093050941620
2021-06-28 06:36:57 +00:00
Hugh Chen
18e7bf55cd [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: fe804966c0 -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: I222c09df0e4cb4587416bf75fe22997498756920
2021-06-28 06:36:55 +00:00
Hugh Chen
87ef5bdf41 [automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc am: 91d5f08e39 -s ours am: 9eef0e089d -s ours am: c278a9637d -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: I61ae827729b3d7529d61e36d8adf9e158ad21eaf
2021-06-28 06:36:49 +00:00
TreeHugger Robot
6f0594ac93 [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: 97c42a5a31 -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: I38de7f3222423edc1bb2a661a08d3bda92977efe
2021-06-28 06:36:43 +00:00
TreeHugger Robot
d0a7bcf227 [automerger skipped] Merge "RESTRICT AUTOMERGE Update string" into rvc-qpr-dev am: b2b280a67a -s ours am: 1c6594bcd4 -s ours am: 98b4be0cb8 -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: I34d52dd370a1b931ad24a51a3b35d64bcc382f98
2021-06-28 06:36:37 +00:00
Hugh Chen
ff719d5bd8 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a am: bee2daea18 -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: I8a2a91ce7420f647f5b6c3a76a31686049ba3011
2021-06-28 06:36:30 +00:00
Hugh Chen
60beadd631 [automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc -s ours am: 76545f383c -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: I14dceb2e7d17451f831bdf124387a4e76d744579
2021-06-28 06:36:23 +00:00