Commit Graph

115942 Commits

Author SHA1 Message Date
Bill Yi
a947d0a622 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9bf84d822 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2bb8103818802698946c8b9d952aabd03c43328f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:19:17 +00:00
Bill Yi
fae53cfbdf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 548e038af7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I26ecd8d012598281f8842dfa4e7189eba1480feb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:19:04 +00:00
Bill Yi
c10285fbdb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3e63f1ab -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5f98cf99712cfd8123b0456d09171a72bcda33ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:18:51 +00:00
Bill Yi
d60d670ccc Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-28 01:55:00 +00:00
Bill Yi
548e038af7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-28 01:55:00 +00:00
Automerger Merge Worker
e3c03e87a2 Merge changes from topic "am-22097985f3b54fc3b130440b4d974f8b" into tm-qpr-dev-plus-aosp am: ceb18e2193
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739242

Change-Id: I1d16b11961f5222a014aba67cf5e0f8f75842445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 22:28:28 +00:00
Bill Yi
d029cca8da [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ed96a6cb86 -s ours am: de9f76aac8 -s ours am: affc368022 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifb2f0a9c259207db694336ef7f00e7faaa93cc77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 22:28:07 +00:00
Bill Yi
383039b89e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ed96a6cb86 -s ours am: 507d0432ec -s ours am: a7d82854a7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idf629650a80ce6068a8f311b0540ea81ef76725f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 22:24:14 +00:00
Bill Yi
49b39124ec [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6577aa89b6 -s ours am: ce0f625500 -s ours am: 597293a4de -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifaa5115918b394dc5226baf10692c0195c43a55a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 22:24:06 +00:00
Bill Yi
fd8559d480 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 15380dd7b4 -s ours am: 8033f5fb69 -s ours am: cf4bbdcf08 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I17b6c308317dc77f0229c3d27bdd26a5872bc85a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 22:23:55 +00:00
Bill Yi
508ca73ab5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 631dfab65d -s ours am: fa76853e84 -s ours am: 8e6785f1f0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5ba0ba8722bc04385a375cf6be456a06f730294a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 22:23:35 +00:00
Automerger Merge Worker
ceb18e2193 Merge changes from topic "am-22097985f3b54fc3b130440b4d974f8b" into tm-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ed96a6cb86 -s ours am: de9f76aac8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6577aa89b6 -s ours am: 747bfb7aed -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 15380dd7b4 -s ours am: dbeef33d53 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 631dfab65d -s ours am: 15cbfb8456 -s ours
2022-08-27 21:55:50 +00:00
Bill Yi
affc368022 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ed96a6cb86 -s ours am: de9f76aac8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I663cae1d62aa2564be813eba03db406b37ec525e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 21:54:26 +00:00
Bill Yi
59a06c33f7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6577aa89b6 -s ours am: 747bfb7aed -s ours
am skip reason: subject contains skip directive

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

Change-Id: I00bbd3d33f78803d8ca4b0bfcdbcc2d16c617bff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 21:54:17 +00:00
Bill Yi
a7d82854a7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ed96a6cb86 -s ours am: 507d0432ec -s ours
am skip reason: subject contains skip directive

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

Change-Id: I487009589662c88508791f0176616cbc8345831f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 21:54:07 +00:00
Bill Yi
abe7fb72ba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 15380dd7b4 -s ours am: dbeef33d53 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I753fc871ac66227e466a3c20cceca2e5f606dfc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 21:54:04 +00:00
Bill Yi
597293a4de [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6577aa89b6 -s ours am: ce0f625500 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia5cc248e41063a842974518d2d1c2448310eb22a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 21:54:01 +00:00
Bill Yi
cb03545d01 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 631dfab65d -s ours am: 15cbfb8456 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib37df8ec9d55b8a1a1c864aa53c77cee4712ffc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 21:53:49 +00:00
Bill Yi
cf4bbdcf08 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 15380dd7b4 -s ours am: 8033f5fb69 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ief37aa9b1fce44f6773ab431901caa2a81654cfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 21:53:48 +00:00
Bill Yi
8e6785f1f0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 631dfab65d -s ours am: fa76853e84 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I726494bbcd0d652785b300e02490243f92ef230d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 21:53:29 +00:00
Bill Yi
de9f76aac8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ed96a6cb86 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2f8bd4d32158fa4b48ed1fe47759ed1b6e04f161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 21:30:44 +00:00
Bill Yi
747bfb7aed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6577aa89b6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib0653896c3db62e2746e39148f9152c3e8ce4b74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 21:30:33 +00:00
Bill Yi
dbeef33d53 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 15380dd7b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2d630c93b5d0f5ee5e049c5b36c09fb5c93dfa5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 21:30:18 +00:00
Bill Yi
507d0432ec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ed96a6cb86 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1da630c544a01a1143a233e1af11d883c3b58ac1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 21:30:03 +00:00
Bill Yi
15cbfb8456 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 631dfab65d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I13d8bd9f82dc4159982de668ca7daabbf1b77579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 21:30:02 +00:00
Bill Yi
ce0f625500 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6577aa89b6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I642292401b3114dcaf010861cc7ef3dfdbf19cb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 21:29:52 +00:00
Bill Yi
8033f5fb69 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 15380dd7b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic697c5b6076ccd053351cb3df7219b65bc9a216b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 21:29:40 +00:00
Bill Yi
fa76853e84 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 631dfab65d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaa9e4ce26c7e51be505cbed8b9cd02d4e824a647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 21:29:21 +00:00
Bill Yi
ed96a6cb86 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-08-27 21:05:56 +00:00
Bill Yi
15380dd7b4 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-08-27 21:05:56 +00:00
TreeHugger Robot
3ed0987f48 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-08-27 08:11:48 +00:00
TreeHugger Robot
664d68cb05 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-08-27 08:11:48 +00:00
TreeHugger Robot
4d4373038d Merge changes from topic "tc_change_22082515_37"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 63567e48bc
  Import translations. DO NOT MERGE ANYWHERE
2022-08-27 08:11:48 +00:00
Kedar Chitnis
4042c8ccc7 [automerger skipped] Merge "Remove feature flag SETTINGS_GUEST_MODE_UX_CHANGES" into tm-qpr-dev am: 82a33ac452 am: c9c224e403 -s ours
am skip reason: Merged-In Iccec0a6b2325f9309c25522ad3f093c6bc1f45e6 with SHA-1 3ff8586db8 is already in history

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

Change-Id: I3d60c4a7bddbf06473a38d1fe37d00596761e64a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 05:07:10 +00:00
Bonian Chen
8b6880320b Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev am: 45051bb169 am: 6af2fb8578 am: b73bfeb0f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746893

Change-Id: I46ff04d8b76d0a7b3759763fcd11536c97499523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 05:06:58 +00:00
Bonian Chen
35cdf693c5 Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev am: 45051bb169 am: 6854fcd20d am: c00e4830a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746893

Change-Id: Ia3f0aa50134d2b3ded3f3b529f5bfd70e7be8759
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 05:05:06 +00:00
Kedar Chitnis
c9c224e403 Merge "Remove feature flag SETTINGS_GUEST_MODE_UX_CHANGES" into tm-qpr-dev am: 82a33ac452
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19664054

Change-Id: Iddbb56c3ce2176ab6f9edbe3353ea2ccfef923e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 04:48:27 +00:00
Bonian Chen
b73bfeb0f1 Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev am: 45051bb169 am: 6af2fb8578
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746893

Change-Id: I018f61baae55f765476882e760263ff1718f8bf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 04:46:08 +00:00
Bonian Chen
c00e4830a5 Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev am: 45051bb169 am: 6854fcd20d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746893

Change-Id: I3642f8b2c2f2e1dcc518b000fc44917c9eeaff8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 04:45:27 +00:00
Kedar Chitnis
82a33ac452 Merge "Remove feature flag SETTINGS_GUEST_MODE_UX_CHANGES" into tm-qpr-dev 2022-08-27 04:36:58 +00:00
Bonian Chen
6af2fb8578 Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev am: 45051bb169
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746893

Change-Id: If948deb5fc93c3654e474bd4d4d588859affbfa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 04:12:07 +00:00
Bonian Chen
6854fcd20d Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev am: 45051bb169
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746893

Change-Id: I61ba7cfbc14f8972a0a8d74055893f5807c73a4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 04:12:06 +00:00
Bonian Chen
45051bb169 Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev 2022-08-27 03:58:07 +00:00
Automerger Merge Worker
38eef9c490 Merge changes from topic "am-1f14ab54c2414b4ca60bb589f9ee6837" into tm-d1-dev-plus-aosp am: 34db7cdde9 am: bc39a69a57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133

Change-Id: If4e0547f68e70cf145acd38eb5dd5aa2d56c0fd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 19:24:49 +00:00
TreeHugger Robot
9a364eb6fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: 29f4dd9a23 -s ours am: 5d6defbe4c -s ours am: 7ff9a55e98 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I91809503f29a99e0bf2c99cad6210f2d11c645d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 19:24:40 +00:00
Automerger Merge Worker
c5fdf6eb2b Merge changes from topic "am-52f1e073427d431498ea82df3bd4b4e1" into tm-qpr-dev-plus-aosp am: 08041f3779
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739241

Change-Id: Icf0aab717faca8b303ad8f064773fa4d3da4345b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 19:22:14 +00:00
Bill Yi
7b6cdb6b35 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5a6b0cdb09 -s ours am: 8b2beac92a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8183ace37016c4ac8986f698f3e13f848665a9ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 19:21:59 +00:00
TreeHugger Robot
055dd415e5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4 -s ours am: 2810928518 -s ours am: c006955815 -s ours am: be93a93ceb -s ours am: 7f7ffbcdac -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia9b26548b6cd27d3e9c0f53514969a26859e4286
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 19:18:19 +00:00
Bill Yi
59d0bf1e5c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f -s ours am: c9ac950159 -s ours am: 58ea31040c -s ours am: 1620b3809f -s ours am: 82e339a78a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I228de650b2937be5d124f107e3d38d56e306eb37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 19:18:07 +00:00
Bill Yi
555aea87bf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f -s ours am: bfd43e8459 -s ours am: 7a3ffa65cb -s ours am: 40e838cb44 -s ours am: d026e6992d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib212e844013f3e14183c51695687ec5ad0baf0b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 19:17:57 +00:00