Commit Graph

112877 Commits

Author SHA1 Message Date
Peter_Liang
772e114438 Avoid the reset item having inconsistent alignment with the others under SuW.
Replaces the LayoutPreference with native Preference for the reset preference which is used for resettings the status of all preferences.

Bug: 232528123
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TextReadingResetControllerTest,TextReadingResetPreferenceTest
Change-Id: I00719f13dc78039269ee373c6b35e12e7ff595ce
2022-07-05 15:32:37 +08:00
Automerger Merge Worker
fd6c0f6a45 Merge changes from topic "am-504131d87dd44507890c9af93b4ea00a" into tm-d1-dev-plus-aosp am: 6e4fd42dac am: 77a97bba64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19128489

Change-Id: Ia02b97aef7ae8f85bee8527a482f3be2390ac8c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 16:58:21 +00:00
TreeHugger Robot
20ea89bdad [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e -s ours am: ec5ba801ba -s ours am: 41d9c1ccb7 -s ours am: 5f246992e4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia8746beb2781751127e4abdac6daafe740e27232
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 16:58:06 +00:00
TreeHugger Robot
360bb6df50 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e -s ours am: 2ec12f7701 -s ours am: 4da1e46d66 -s ours am: 41a2371036 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I776b2d298cf64036278599c605706a47ba09fc37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 16:52:49 +00:00
Bill Yi
53e119c78b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc -s ours am: 281a9b7507 -s ours am: bd65c258bb -s ours am: 5e2224db6c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3c211c4878b321c2953a2be704311389ffe57749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 16:52:32 +00:00
Automerger Merge Worker
77a97bba64 Merge changes from topic "am-504131d87dd44507890c9af93b4ea00a" into tm-d1-dev-plus-aosp am: 6e4fd42dac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19128489

Change-Id: I4888f6731485a54624e5e940fa06e1f377247c30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 16:51:58 +00:00
TreeHugger Robot
5f246992e4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e -s ours am: ec5ba801ba -s ours am: 41d9c1ccb7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If2e20e2104eedd3f891d741ae6c0ad82fb536a32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 16:51:43 +00:00
TreeHugger Robot
41a2371036 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e -s ours am: 2ec12f7701 -s ours am: 4da1e46d66 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib3d1989e486cf0e4a5096d121dec0e4ec34ce80b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 16:47:21 +00:00
Bill Yi
5e2224db6c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc -s ours am: 281a9b7507 -s ours am: bd65c258bb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idba5f61cb6efbb06fe5ba351a1d031a437536b42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 16:47:07 +00:00
Automerger Merge Worker
6e4fd42dac Merge changes from topic "am-504131d87dd44507890c9af93b4ea00a" into tm-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e -s ours am: ec5ba801ba -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc -s ours am: e5e9661324 -s ours
2022-07-01 16:25:48 +00:00
TreeHugger Robot
41d9c1ccb7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e -s ours am: ec5ba801ba -s ours
am skip reason: subject contains skip directive

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

Change-Id: I48d9bcd4fe47e20f2d4d374c0d9862fae442be21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 16:23:59 +00:00
TreeHugger Robot
4da1e46d66 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e -s ours am: 2ec12f7701 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I211dcf4f7569227e72d6d7927c031e5e1c321f79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 16:23:50 +00:00
Bill Yi
cd8d1eecd8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc -s ours am: e5e9661324 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7745af204a16d8efc774ffa8c7ee8adc71551a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 16:23:43 +00:00
Bill Yi
bd65c258bb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc -s ours am: 281a9b7507 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5acd27c0c6052afa3a891d01c39e0c67f01b253f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 16:23:30 +00:00
TreeHugger Robot
7283bad89a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e -s ours am: 0c8db6b115 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I20b92cf4f0fd0d93abfb85d3ca4d8a6f2157d688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 16:05:24 +00:00
Bill Yi
64552b580f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc -s ours am: 4a26414c9a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id44c0b6bda9e5b78c182da68d7a9e1566657440c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 16:05:08 +00:00
TreeHugger Robot
ec5ba801ba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5e28452c29fb27e398a4c388a85c0e347d01ee64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 15:58:54 +00:00
TreeHugger Robot
2ec12f7701 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic84b8415af1de525b81779425e03f4873344819d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 15:58:39 +00:00
Bill Yi
e5e9661324 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id148d0230825c08c8afe434ef6a65c77f004c62f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 15:58:38 +00:00
TreeHugger Robot
0c8db6b115 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ccd485016e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I83cfaefc4223c6b00bc1585167cb0d01569de8f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 15:58:37 +00:00
Bill Yi
281a9b7507 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I97870469241d1530ef0acbf7dedaa7dc88994ab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 15:58:22 +00:00
Bill Yi
4a26414c9a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19777b98cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I00b52f58ed898321e90ad0c9cd17503261cf690e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 15:58:18 +00:00
TreeHugger Robot
ccd485016e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-07-01 15:38:52 +00:00
Automerger Merge Worker
bb01df3427 Merge changes from topic "am-bd02cec51a7c47dda2adc777e3666a7c" into tm-qpr-dev-plus-aosp am: e0600ae051
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133161

Change-Id: I9044475814386a0ba0036ca6d7db0af2d5110906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 08:01:27 +00:00
TreeHugger Robot
63fc34170f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 2c5705010b -s ours am: 649e89d2ee -s ours am: 0c724a6f1c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I69ad96772bbd4107a35977ed2a95645658e659f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 08:01:05 +00:00
TreeHugger Robot
90c3eeba77 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 2c5705010b -s ours am: 2f79c879cc -s ours am: 316a265b80 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id927eeb9c9abda4f1ffae0a97af5d1d893f0240f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 07:57:15 +00:00
Bill Yi
f78a4ff679 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a140e645ff -s ours am: 7d8e972bd7 -s ours am: 751c73ac30 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I287656404c47f3f8251a828aebee49f68fe6cf4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 07:56:56 +00:00
Automerger Merge Worker
e0600ae051 Merge changes from topic "am-bd02cec51a7c47dda2adc777e3666a7c" into tm-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 2c5705010b -s ours am: 649e89d2ee -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a140e645ff -s ours am: d69c3e175e -s ours
2022-07-01 07:32:16 +00:00
TreeHugger Robot
0c724a6f1c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 2c5705010b -s ours am: 649e89d2ee -s ours
am skip reason: subject contains skip directive

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

Change-Id: If3fb5f3cee40e3ca61ebebd0974e5307f1c9c2c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 07:31:07 +00:00
Bill Yi
ded7d7f6c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a140e645ff -s ours am: d69c3e175e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I597a227487ed7dc7444a3a3048d1ad33fb493bb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 07:30:49 +00:00
TreeHugger Robot
316a265b80 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 2c5705010b -s ours am: 2f79c879cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I77d43d371feec704c9613311ad45eb41b2443fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 07:30:44 +00:00
Bill Yi
751c73ac30 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a140e645ff -s ours am: 7d8e972bd7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4f9d12964f2b31585e4dafb51dbaccb934ccf78f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 07:30:28 +00:00
TreeHugger Robot
649e89d2ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 2c5705010b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idf766fb07ab08b24946ed8b3b17212e0e05efd0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 07:05:09 +00:00
TreeHugger Robot
2f79c879cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 2c5705010b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3cdd22cc82569aeb2628adae2703f80f4d8684b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 07:05:08 +00:00
Bill Yi
d69c3e175e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a140e645ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: I42f49c828d21c6945191af0654fca3ccccb97071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 07:04:50 +00:00
Bill Yi
7d8e972bd7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a140e645ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c095f83aa8c0af5dc2ef0d20772a998e2512893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 07:04:46 +00:00
TreeHugger Robot
2c5705010b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-07-01 06:33:55 +00:00
Bill Yi
d446624f2e Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-07-01 04:32:33 +00:00
TreeHugger Robot
730d98f08c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c037a7c811 -s ours am: 42d25a272d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I06031d2a0d726e7b82f9708402b3ff1df71d7067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 03:51:49 +00:00
Bill Yi
129344e294 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac73a2f10f -s ours am: fb7f6b8a3a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic0096527d80ae5cc4feed444a1d0f5007c06b616
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 03:51:16 +00:00
TreeHugger Robot
daef5d6a9f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 10f1d35eef -s ours am: ad603e2ece -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4fba5fc0933590725e8d326817de96b682428607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 03:50:53 +00:00
Bill Yi
5f84b20f08 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d642b8754c -s ours am: 77adb10b2e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifbee588eb4ce39a19982f33c301c6a78154050d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 03:50:32 +00:00
TreeHugger Robot
42d25a272d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c037a7c811 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3fc8a36a40ad8c5ab40a298e485b905c345dcbb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 03:31:08 +00:00
Bill Yi
fb7f6b8a3a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac73a2f10f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I53f6d25b1c14c9f5c79c840e4b5eae34a3904335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 03:30:31 +00:00
TreeHugger Robot
ad603e2ece [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 10f1d35eef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I57ae1ca9e5386981631b3054d0e2bd36b88b4673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 03:30:09 +00:00
Bill Yi
77adb10b2e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d642b8754c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a11d64a9e95b7ef272a05df2a723e5d81803067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 03:29:50 +00:00
TreeHugger Robot
c037a7c811 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-07-01 03:11:28 +00:00
TreeHugger Robot
10f1d35eef Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-07-01 03:11:28 +00:00
Automerger Merge Worker
0c7258b3b7 Merge changes from topic "am-92a10bb61c25454cb97bca40d2487b12" into tm-d1-dev-plus-aosp am: 1e4de9c9ac am: 3e91217ba4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19133158

Change-Id: If7a48f57fe83d8fbd4084f432e77083f60c23ca7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 02:59:41 +00:00
TreeHugger Robot
aa7d3f3dcd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: f2e5977255 -s ours am: f4cd4b3e68 -s ours am: 2b381151ee -s ours am: 0ec68d2a3e -s ours am: e0180e77a3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id070a55c8a6ac83c832ea1888436438c8804d7f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-01 02:59:30 +00:00