PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
128,311 Commits 1 Branch 0 Tags
4b0bef1fbcfc58d3d0e249c9c291af12aa322377
Commit Graph

128311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Huang
4b0bef1fbc Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd am: 09296b5cdd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079

Change-Id: I011d185d14e8412227981cef3030f602bebb4a32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:16:26 +00:00
Bill Yi
1eb4caba3b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e -s ours am: c40e106be2 -s ours am: 7ffa45e08f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb7f33ff429933fc6d2f2e9c5876fc9367892b7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:15:45 +00:00
Bill Yi
3a14d3485d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 789290be46 -s ours am: 5b23a264e9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id2d3a566900faa7d49238d8a9962c64949eed489
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:14:27 +00:00
Bill Yi
d6107db260 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: c5a289d530 -s ours am: 7316a42fd9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5e75f940d90f69c5aac3e3316e1cb0b9aa10366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:14:04 +00:00
Bill Yi
78dfaa1063 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c13633d1d0 -s ours am: c024f39b78 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie082b084f66c793c1c112fed597c7b0af5786214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:13:04 +00:00
Bill Yi
e20343afb9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2e8c8077b -s ours am: ecfc3df071 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I46388a49d3fef7d89d3679b14e03ace02ef7b5cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:12:59 +00:00
Bill Yi
6257eacd0d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 67553d6348 -s ours am: 0efe096619 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I75b4d73a1ba58d699b5ea5ea70306ac2194acad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:12:55 +00:00
Bill Yi
91cbebd1d0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 197ad03f9e -s ours am: c7f64a3e99 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I25e1c200d23012314ea97bff4cbed264b2f2c957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:12:30 +00:00
Bill Yi
939c15d7e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: dd664531a5 -s ours am: 4fdb6d6372 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f7beb5054166a5e7a5cd5d068f547abc6884e3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:12:08 +00:00
Bill Yi
8fce49505c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81564a8384 -s ours am: df526aa998 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I371910e08bce87fd7ab8cf669964ec08acfa4adf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:11:47 +00:00
Daniel Huang
09296b5cdd Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079

Change-Id: I7eb87a1fba1768eeefa0248d38f87316da3b5231
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:40:22 +00:00
Bill Yi
7ffa45e08f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e -s ours am: c40e106be2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7fdff98e3427a7c29b65668c0626508818db08f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:39:17 +00:00
Bill Yi
5b23a264e9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 789290be46 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibdc3db06c5666f7d5dd76567ca788da03c31709c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:37:32 +00:00
Bill Yi
7316a42fd9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: c5a289d530 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I36a2552583affaf2e50c49f9491c228de8d84909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:37:11 +00:00
Bill Yi
c024f39b78 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c13633d1d0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7c4d18affd90c4bd2f8403d6ab7d1196144889c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:36:23 +00:00
Bill Yi
ecfc3df071 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2e8c8077b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib64f3155f9e3d52ace4ea261850c73794795e68a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:36:19 +00:00
Bill Yi
0efe096619 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 67553d6348 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I33412a8e9b98de986453ef07732f11164eed91ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:36:14 +00:00
Bill Yi
c7f64a3e99 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 197ad03f9e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife23832514039436cb0b3db04ca47fcd83c4c47a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:35:48 +00:00
Bill Yi
4fdb6d6372 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: dd664531a5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibb262569777335c93fe2a704c863085c7c3a56df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:35:25 +00:00
Bill Yi
df526aa998 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81564a8384 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I23c72f96a83cddd34640971057e68649c6ca2477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:35:07 +00:00
Daniel Huang
e51bbfcbbd Merge "Update summary for Languages and Keyboard" into udc-dev 2023-05-24 01:09:38 +00:00
Bill Yi
c40e106be2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c6c9f25681b90088183001886e90201f6a3cee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 23:48:48 +00:00
Bill Yi
789290be46 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id43e7b6ad2a44a63517ba4d6ef18e4fef367bb78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 23:32:02 +00:00
Bill Yi
c5a289d530 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec87273cf2cd0cee417d4eb7e10e1b0327d3f9aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 23:31:27 +00:00
Bill Yi
c13633d1d0 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-23 23:05:26 +00:00
Bill Yi
67553d6348 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-23 23:05:26 +00:00
Bill Yi
dd664531a5 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-23 23:05:26 +00:00
Chun-Ku Lin
7207b8d69d Merge "Set textDirection=locale and layoutDirection=locale for alert dialog" 2023-05-23 23:04:12 +00:00
Bill Yi
27d96e91e7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-05-23 23:01:47 +00:00
Treehugger Robot
932b2b5a75 Merge "Clean up test with Robolectric's way to launch a fragment with an activity." 2023-05-23 22:59:25 +00:00
Chun-Ku Lin
219d4e6ca1 Set textDirection=locale and layoutDirection=locale for alert dialog 
It's strongly recommended by internationalization team to set
android:textDirection="locale" and android:layoutDirection="locale" to
tackle a text that consists of RTL and LTR characters.

Bug: 279491415
Test: manual
Change-Id: I0dfa0da22e70d267d8d8ed8e9c5be3d6db107841
 2023-05-23 19:28:12 +00:00
Bill Yi
4200724c4c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb -s ours am: 1c5a35aa3e -s ours am: 9c3bdf8747 -s ours am: 0338351d66 -s ours am: 0d84b2d208 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia102fef014a8098f37e24bfd5e32d20f3e3338ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 19:15:35 +00:00
Chun-Ku Lin
f4d7518710 Clean up test with Robolectric's way to launch a fragment with an 
activity.

Robolectric has shadows for many Android framework's code. With the help
of Robolectric, We don't need
to use mock the return value of every method Activity or Fragment has.

Bug: 283885638
Test: atest AccessibilityDetailsSettingsFragmentTest

Change-Id: I77dfa755e3a1b6a240a06f74b5a6c5984534c831
 2023-05-23 19:06:33 +00:00
Bill Yi
0d84b2d208 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb -s ours am: 1c5a35aa3e -s ours am: 9c3bdf8747 -s ours am: 0338351d66 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I04abd7aaa0b8cfea9a265430a54b1356c900aaf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 18:46:03 +00:00
Bill Yi
0338351d66 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb -s ours am: 1c5a35aa3e -s ours am: 9c3bdf8747 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2c5e95b64c7ab9ba5025330f88039d888d1bf73b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 18:38:03 +00:00
Bill Yi
532254137d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb -s ours am: dbee886a9a -s ours am: cd693e3bbd -s ours am: b8a14ba9ec -s ours am: 4d58ae10b4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaee6a8115bce72c569b9e286580505de20d6bc45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 18:29:34 +00:00
Bill Yi
28fbc06de6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb -s ours am: dbee886a9a -s ours am: 5640cd61f6 -s ours am: bae7564f5b -s ours am: 2ee79a52b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44dd288ecebaae69bd910f6d559fe028964af354
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 18:27:59 +00:00
Bill Yi
54c9e72357 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb -s ours am: dbee886a9a -s ours am: 5640cd61f6 -s ours am: 54b1413701 -s ours am: 76641727a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I69bbd421a672ea9d8d674d4563c909e3d3ed8781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 18:21:26 +00:00
Bill Yi
4d58ae10b4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb -s ours am: dbee886a9a -s ours am: cd693e3bbd -s ours am: b8a14ba9ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id714d6ebbe42570dfaab0428d5949940d5b230a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 18:21:20 +00:00
Bill Yi
2ee79a52b0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb -s ours am: dbee886a9a -s ours am: 5640cd61f6 -s ours am: bae7564f5b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I901c04992197e136332f2548205af5dccbd1e981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 18:20:18 +00:00
Bill Yi
9c3bdf8747 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb -s ours am: 1c5a35aa3e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I19b5d3769302cb74163cc182847d108651db552f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 18:14:57 +00:00
Bill Yi
76641727a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb -s ours am: dbee886a9a -s ours am: 5640cd61f6 -s ours am: 54b1413701 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibc3e02ed11ccc0fab9974f0fd52805aaa7c06a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 17:22:21 +00:00
Bill Yi
53c0788cc9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb -s ours am: dbee886a9a -s ours am: c6b347a2d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f7ebd0726436861bb1c4b02467fe11ea5c5bf1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 17:20:03 +00:00
Bill Yi
54b1413701 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb -s ours am: dbee886a9a -s ours am: 5640cd61f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7c9a61bfbf67805aaecd7ddd2b7b3bcd49898f29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 17:15:55 +00:00
Treehugger Robot
e50f4912d4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: abc0f3d620 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia1964c993d28557e60b19bb3fbcf326b24b58a3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 17:15:39 +00:00
Bill Yi
e0df563adb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a24b1e9d9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id6df477e4414be8f951e1ccbc0688f979d70b9a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 17:15:23 +00:00
Bill Yi
b8a14ba9ec [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb -s ours am: dbee886a9a -s ours am: cd693e3bbd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia08db4c04fd1ae501bc29b40e1525691c03e5791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 17:14:56 +00:00
Bill Yi
bae7564f5b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb -s ours am: dbee886a9a -s ours am: 5640cd61f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7d0e3010ff0cb260c57c0568318201a76180d9f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 17:14:08 +00:00
Treehugger Robot
e05f1cf694 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 4ec08147d7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib0d918e9c4dfeea63cf1650d5735ca8296acc9b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 17:13:50 +00:00
Bill Yi
32ec2894c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00687505f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5669598a1be3d2718ad813bbf7d05b0bb5109a3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-23 17:13:42 +00:00