Commit Graph

110137 Commits

Author SHA1 Message Date
Bill Yi
1344da6685 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9bf84d822 -s ours am: ad566bfccb -s ours am: 521735e2aa -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: I582f124dd6c098578e031ebe10f76db2ef8d92e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:34:54 +00:00
Bill Yi
0ad6470854 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 548e038af7 -s ours am: 1eb0406eff -s ours am: a371b6dd21 -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: I9b69665c1116b75abf31cf4bb05c5b940f75629d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:34:40 +00:00
Bill Yi
a5fdca8211 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3e63f1ab -s ours am: 00a98ec423 -s ours am: 676cc83e25 -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: Ib95f5113902a30f163cb057d65a8cba19582047a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:34:30 +00:00
Bill Yi
ac0506a4f3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d60d670ccc -s ours am: 34a6f0e456 -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: Ieed1b825fef248bd880ea486a0d9ffbc1151d634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:28:41 +00:00
Bill Yi
be10423638 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9bf84d822 -s ours am: ad566bfccb -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: If013bf252122759c7d320eb0189dfd33355478e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:28:31 +00:00
Bill Yi
8cef8bb893 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 548e038af7 -s ours am: 1eb0406eff -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: I787d3b0885874540ef95b94ba3909ff4c654d761
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:28:17 +00:00
Bill Yi
c37d1eccee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3e63f1ab -s ours am: 00a98ec423 -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: I83bf17ebf1f3bd1403f552120073fde97650a6dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:28:05 +00:00
Bill Yi
0a08da4ca8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d60d670ccc -s ours am: 34a6f0e456 -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: Ia2fe60452dec4348ca6fe7d177f03942d65f9969
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:26:10 +00:00
Bill Yi
521735e2aa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9bf84d822 -s ours am: ad566bfccb -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: I3657f8f740c010700a3199a50d9d20b58ff94441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:26:01 +00:00
Bill Yi
a371b6dd21 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 548e038af7 -s ours am: 1eb0406eff -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: Iba7623004fd8c2ca19ed2ca188e148b063924a70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:25:47 +00:00
Bill Yi
676cc83e25 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3e63f1ab -s ours am: 00a98ec423 -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: Id738ed8783958f6afdcc578e6f366cae70fd2192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:25:34 +00:00
Bill Yi
34a6f0e456 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d60d670ccc -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: I4ed75a7a45e5c83cc9243a0a5c64274987dbf19b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:22:11 +00:00
Bill Yi
ad566bfccb [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: I5afaca68733eba118875ab8ffe8c35d71caccbd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:22:00 +00:00
Bill Yi
1eb0406eff [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: I885fd6af7a8d76ac440e54f3026482de588bab2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:21:46 +00:00
Bill Yi
00a98ec423 [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: I01a66f9a0e5e1b649f31ab2ab7538e5d8b62aedf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:21:32 +00:00
Bill Yi
71d1cd4557 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d60d670ccc -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: I25f8935aea893bb712cb3e002719360bb496092a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:19:32 +00:00
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
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
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
bc39a69a57 Merge changes from topic "am-1f14ab54c2414b4ca60bb589f9ee6837" into tm-d1-dev-plus-aosp am: 34db7cdde9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133

Change-Id: Ie70307ed4dc22e4f1b35be087d6fe902eb56db1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 18:57:14 +00:00
TreeHugger Robot
7ff9a55e98 [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 skip reason: subject contains skip directive

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

Change-Id: Ie40049b23c5818cac1c780c75125840441424762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 18:57:01 +00:00
Automerger Merge Worker
08041f3779 Merge changes from topic "am-52f1e073427d431498ea82df3bd4b4e1" into tm-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5a6b0cdb09 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d1ddadb67 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 31c69075a7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 926be7fe01 -s ours
2022-08-26 18:56:00 +00:00