Commit Graph

104365 Commits

Author SHA1 Message Date
TreeHugger Robot
73b8636e46 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1b42795ed4 -s ours am: 7b9337e2e6 -s ours am: 9da61aad1b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I33eff45c49824ffe7ae5042955aa613eab3244ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:17:51 +00:00
Bill Yi
f20e5adb2a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9fd2b9fbcc -s ours am: 0cab12760b -s ours am: 085d671893 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I49046f105a6951d70afdaed34a3c62a5c3ddf8e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:17:40 +00:00
TreeHugger Robot
f6c941f080 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8e13f26686 -s ours am: 2756f55628 -s ours am: cefcc7ec87 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I77bc9af72616185015828b5d7819f174193cd9e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:17:26 +00:00
Bill Yi
7c64fb8045 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4cbb2ea010 -s ours am: e8c70cb6a2 -s ours am: 88a0fb3590 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idda318f0f70bb591e86a1ea46d97ad729579d34b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:17:15 +00:00
TreeHugger Robot
e13ddf0b8f Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe am: 7e3c63dcd5 am: 66e3dd58b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990

Change-Id: I3e3c1c0c7d1419dd4702f68dd201cae9e913c7b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:14:32 +00:00
Bonian Chen
82fb1a8e87 Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467 am: 2a1040e1e2 am: 89060986b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805

Change-Id: Ib54d7e5be1285c261a5813e1151df9381ca12fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:14:27 +00:00
Yanting Yang
de9c5acffa Merge "Fix reset app preferences for work profile apps" into tm-dev am: 51204e3deb am: 799f7218cd am: a4ab140880
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234983

Change-Id: I13ca64be8a78a7e41edcedf0c962f34ecbb92eb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:14:21 +00:00
Martijn Coenen
ac959285a2 Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290 am: d77f3426a2 am: 85f1effe66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004

Change-Id: Ic69e3095f104017d07f930ffe76a13b31df74984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:14:16 +00:00
Menghan Li
1663b83f2f Merge "Remove "Remove animation" assistive technologies in setup" into tm-dev am: f7b967ffd4 am: efdfca87d8 am: 1002ad9963
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234984

Change-Id: Iebfd6804f99a610c55c4f007f8d390f6ced7b1b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:14:09 +00:00
Tsung-Mao Fang
aa0209718d Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333 am: 7e6dd3f4b7 am: c60a7e6109
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967

Change-Id: I951e650e3d338f9d3bc09deb869d77d1e2722077
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:14:00 +00:00
Bonian Chen
8c908065c1 Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev am: 2d72d9f450 am: 7dcd7194b4 am: 68f0010133
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234985

Change-Id: I0ea7bb24be3f176e5382bbfc4371d83ae18e21d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:07:20 +00:00
TreeHugger Robot
cd2294ad10 [automerger skipped] Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7 am: 24a2986cfa am: 2c5f09d6b6 -s ours
am skip reason: Merged-In Ia790e345be811be1b60762ff819544d03c5a18fd with SHA-1 78765b0b26 is already in history

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

Change-Id: Ic5118a6105135f9d1488030f08ec37f34b5e9001
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:07:15 +00:00
SongFerng Wang
1bb463b84e Merge "Reuse the active esim slot" into tm-dev am: b1613b210d am: 2c7794515d am: a3a3842259
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422

Change-Id: I03fd3577ab784553219697961ebc817d0ce15f96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:07:09 +00:00
Chaohui Wang
b4804298db Merge "Fix Voice Access scroll down in the Add network" into tm-dev am: 1107c1c220 am: d6a9c62ff9 am: 2d2833cf9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158874

Change-Id: I0e0acd55589429f4e46b472733a3cc1a26a059a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:07:04 +00:00
Chaohui Wang
b08dfb2a16 Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de am: 61161eab14 am: bf652e736b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715

Change-Id: If129b3bd61198a376c190d7094c983c1c14c6c24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:06:55 +00:00
Bonian Chen
6527793b66 Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9 am: b0e2411297 am: 129c031930
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632

Change-Id: I339a2fffaf5fcd662154c2a52dd68be2e5ff7370
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:06:10 +00:00
TreeHugger Robot
808874d13e Merge "Fix More details not work on fingerprint" into tm-dev am: cb38753530 am: 3433f8a9b2 am: 2d72c0e67e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197508

Change-Id: Ib8e366e638e9a67a307f86e5187282812051d92b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:06:04 +00:00
Bill Yi
f86a4fa7b1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7ada1a1b2e -s ours am: 9825da46ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia6bab2b52e2218852cc6808b90d422e7d56f0503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:04:34 +00:00
Bill Yi
1f18e77bb5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 196ff79720 -s ours am: b781b9c38d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6a117e2864c2555aada25071eed3bca7b40acd0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:04:22 +00:00
Bill Yi
e065c811c3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5898a6df49 -s ours am: 059234f150 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I43810573c1dd052f5799f88240f6da258e0ab9a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:04:03 +00:00
Bill Yi
563f8694db [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f4c7931e46 -s ours am: 72fbe398ca -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5af665f0f0dd94c8f27654cdfbcc52ff4c8ff37a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:03:47 +00:00
TreeHugger Robot
2f9fd60154 Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe am: 7e3c63dcd5 am: 0fa9182b25
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990

Change-Id: Ie6eba60af1a08a3b426dd71f08844a7aee39db5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:03:03 +00:00
Bonian Chen
6b814f7e56 Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467 am: 2a1040e1e2 am: 2dad1245e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805

Change-Id: If613e825bb1592a84c5c4504e2221a51a2a56303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:02:57 +00:00
Yanting Yang
50944a0bdf Merge "Fix reset app preferences for work profile apps" into tm-dev am: 51204e3deb am: 799f7218cd am: 641b5b67b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234983

Change-Id: I7f9ca8a44e5c29e3b93cc06cc109ebea54f7fb33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:01:43 +00:00
Martijn Coenen
f246a543a9 Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290 am: d77f3426a2 am: 534a851e32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004

Change-Id: I9a8fdfb31b36185aaeb87698ed8ba8279254c335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:01:35 +00:00
Menghan Li
6f804c9892 Merge "Remove "Remove animation" assistive technologies in setup" into tm-dev am: f7b967ffd4 am: efdfca87d8 am: d83bb8f209
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234984

Change-Id: If6ce2ad290e47261db2d0e68ca24f0774b018a60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:01:28 +00:00
Tsung-Mao Fang
f2f8618d62 Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333 am: 7e6dd3f4b7 am: 695503018c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967

Change-Id: I4977595c5838547bf984e2e12aff3a18ccc61f02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:01:15 +00:00
TreeHugger Robot
ba651dcdce Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: 0c8f044705 am: 97b69588df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: If874e14505ec918d41e2b1c9b0dd0b3dff94d264
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:59:30 +00:00
Bill Yi
54859fcba0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: d4631b0d42 -s ours am: 1fcabe2452 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0945269a4971aef0c482a3627b4658b03c5bcc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:59:13 +00:00
Bonian Chen
66a399a0c6 Merge "[Settings] Broken test fix - SimStatusDialogControllerTest" into tm-dev am: 2d72d9f450 am: 7dcd7194b4 am: b0877cfa9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234985

Change-Id: I2e7169a192d8be56f73f88da1443a484a6bf4407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:53:01 +00:00
TreeHugger Robot
9da61aad1b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1b42795ed4 -s ours am: 7b9337e2e6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I72631a9fbaa7e2c65a394bccdf394803eb1834c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:45:25 +00:00
Bill Yi
085d671893 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9fd2b9fbcc -s ours am: 0cab12760b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5ca34dd199bff7a615a3f63363089fcf919f2053
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:45:13 +00:00
TreeHugger Robot
cefcc7ec87 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8e13f26686 -s ours am: 2756f55628 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibeea7caf1d16a07ac03a910bfd6f2a1cd49708c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:44:58 +00:00
Bill Yi
88a0fb3590 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4cbb2ea010 -s ours am: e8c70cb6a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2037819b1707c24d17253c9699a4e56f78122126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:44:46 +00:00
TreeHugger Robot
8b8c3b45bd [automerger skipped] Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7 am: 24a2986cfa -s ours am: dd348882d7 -s ours
am skip reason: Merged-In Ia790e345be811be1b60762ff819544d03c5a18fd with SHA-1 78765b0b26 is already in history

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

Change-Id: I000b0d7b4c2f3857f29ecad353ae390d79a2e750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:43:11 +00:00
SongFerng Wang
8a60ff49d3 Merge "Reuse the active esim slot" into tm-dev am: b1613b210d am: 2c7794515d am: 33f243f937
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422

Change-Id: I1c03b0a3bea7c0af242c1a030a3c60bb7af7bf15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:42:55 +00:00
Chaohui Wang
488dceed93 Merge "Fix Voice Access scroll down in the Add network" into tm-dev am: 1107c1c220 am: d6a9c62ff9 am: ec4a4248a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158874

Change-Id: I7598c39a3ec40701360fed32b3617ec5e89b5403
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:42:38 +00:00
Chaohui Wang
d7a05b918c Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de am: 61161eab14 am: 0c6af8944e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715

Change-Id: Ibb8d4d91a8593921705dc0302da01c542aab60fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:42:18 +00:00
Bonian Chen
6b83653c57 Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9 am: b0e2411297 am: e792ffe112
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632

Change-Id: If97dcdd9c388cba93054310aff5fc65b42392faf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:41:53 +00:00
TreeHugger Robot
45396293a0 Merge "Fix More details not work on fingerprint" into tm-dev am: cb38753530 am: 3433f8a9b2 am: 83e71c22e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197508

Change-Id: I509be229945588df8a0550f948ced3c1a34a7a78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:41:47 +00:00
Bill Yi
92b1facae8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 7ada1a1b2e -s ours am: b6d3b477ea -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id727251382d82161a93a5ff568b39c1fb9aa2f85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:41:06 +00:00
Bill Yi
8607a8f1be [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 196ff79720 -s ours am: bc00cbb900 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6b9a2f92f5ad739b769157b0c70158556cd78d80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:40:53 +00:00
Bill Yi
630d664d54 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5898a6df49 -s ours am: 66101cee32 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifeaa181c178247f4960823c2146ff0d21a48252b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:40:35 +00:00
Bill Yi
eb9c5ef350 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f4c7931e46 -s ours am: 834950e817 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6f945aab568aaa70b6c08b7fa8c6094fd6a5b4e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:40:19 +00:00
TreeHugger Robot
d748407e29 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fbbd1f1109 -s ours am: f8181ea933 -s ours am: a6e210ff8a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic6266aacfb977eb0ef2f9c392691a55ec9c4d61c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:35:51 +00:00
The Android Open Source Project
da915ac7fd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5116946868 -s ours am: 9db4d03357 -s ours am: 379f19fb30 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia6c70ed3f6b7129e329305584cb9b4825e64ced8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:35:48 +00:00
TreeHugger Robot
01000b104f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ffe35d0df -s ours am: 176fb51f4f -s ours am: defb287459 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I27090203f486224e3032d8548fc109a6727bc427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:35:44 +00:00
The Android Open Source Project
7311b730bf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5b6c71281 -s ours am: 0e3016543c -s ours am: 44bf820478 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaed80cc05796029db110c081bd06246a9278861a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:35:39 +00:00
TreeHugger Robot
5bee6c031a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1b42795ed4 -s ours am: ab1590098a -s ours am: 8348e67936 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I126b2356985e76d2c8d63866b97d4e3d167b7b11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:35:30 +00:00
Bill Yi
94e58a49f0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9fd2b9fbcc -s ours am: 54784f7246 -s ours am: 03e09d6366 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iacec75007270df362373862a5f95433700327cd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:35:21 +00:00