Commit Graph

124348 Commits

Author SHA1 Message Date
Fangqiu Su
5ed8e6bc0e Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436 am: a176782c18
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510

Change-Id: I2eaa42894698dd627630aba0480046e81fb31b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 01:11:31 +00:00
Chaohui Wang
5075ba7c38 Merge "Fix EID dialog related issues" into udc-dev am: 56f2c894d8 am: 34a3c229a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789357

Change-Id: I04184413dac0fecd1da0a4561adadf10553eed10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 01:10:29 +00:00
Chaohui Wang
6ec804e4eb Merge "Fix EID dialog related issues" into udc-dev am: 56f2c894d8 am: 7823686740
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789357

Change-Id: Ia99c1c7b338ced65dcc89d022057cd6ca10b29db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 01:09:27 +00:00
Treehugger Robot
646e95241d Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-25 01:09:25 +00:00
Treehugger Robot
103dfefdad Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-25 01:09:25 +00:00
Treehugger Robot
29ba678514 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-25 01:09:25 +00:00
Chaohui Wang
34a3c229a0 Merge "Fix EID dialog related issues" into udc-dev am: 56f2c894d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789357

Change-Id: Iac821365230ebabd0ad4648ea43860bf3f8f262d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:34:15 +00:00
Bill Yi
92afd34258 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb6de672dc -s ours am: ae326b5f83 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2c90792285d969859704d27cf1d966669470c291
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:32:04 +00:00
Bill Yi
e0e2df5e16 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a04e12bf -s ours am: fc348ab76d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia77c2241e36df3c10d9f1bc7f69ff733b6e79e60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:32:01 +00:00
Bill Yi
a90458fe71 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ae1b6f1e35 -s ours am: 733d6f5579 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7167079b6ec5fd7a478d6868230838d4ab236113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:31:59 +00:00
Bill Yi
eb791b09dd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71c7b5f54c -s ours am: f477d02f91 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic3957e1b6ca27cc5ee38feb3b07186cc2d938cf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:31:55 +00:00
Bill Yi
fe774bfa67 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ef269038ef -s ours am: e676a561d8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9f1a6944219b7a4dc4d93ed65327d26ea3561a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:31:44 +00:00
Chaohui Wang
7823686740 Merge "Fix EID dialog related issues" into udc-dev am: 56f2c894d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789357

Change-Id: Iefc5bc85dc359433dcb6957cfee81eda843ee6d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:31:24 +00:00
Bill Yi
41fa42fc6a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c646d4394 -s ours am: f537b87b7a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I89f56cdb8f4fd87153f7e9e26ddc51aa3f03d7f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:30:31 +00:00
Fangqiu Su
a176782c18 Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510

Change-Id: Ifef3769deeed83ef20214e9ade0b2f3f9000ccfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:27:13 +00:00
Chaohui Wang
5fba57460c Merge "Fix EID dialog related issues" into udc-dev am: 56f2c894d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789357

Change-Id: I89ef02b853287ce35d1feb7bd0c6abeccdfdbc61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:24:45 +00:00
Chaohui Wang
56f2c894d8 Merge "Fix EID dialog related issues" into udc-dev 2023-04-24 23:46:42 +00:00
Fangqiu Su
233c708436 Merge "Update uiautomator references in packages/apps/Settings/tests/unit" 2023-04-24 23:46:23 +00:00
Bill Yi
496cdfbfe9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb6de672dc -s ours am: f9392111bb -s ours am: f61d20ef0f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idce7c7ac8e6815730ff2ef1ab4f6c0d82ecee9c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 23:20:58 +00:00
Bill Yi
f0107b1649 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a04e12bf -s ours am: 19a53a5241 -s ours am: 230ca0100e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8a1fe4d6cea107734c9a9efd4bf13a98b8820cb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 23:20:56 +00:00
Bill Yi
48545a79e1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ae1b6f1e35 -s ours am: bcafcba421 -s ours am: d7d5e57707 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic6036ec4a4f290f174d5acbbfcdb45c94c4f2495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 23:20:54 +00:00
Bill Yi
3f1a462345 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71c7b5f54c -s ours am: f0911b2572 -s ours am: df3b739286 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia5d9cc7112757ffc6cb4e71224c05e1f3861a0e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 23:20:39 +00:00
Bill Yi
0f89de4ef5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ef269038ef -s ours am: ec6a532d98 -s ours am: 06b07322cd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib8a3a91c6d2e187ff259adbeb4331f04fe39fa69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 23:20:09 +00:00
Bill Yi
e682ff125f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c646d4394 -s ours am: 7218d10694 -s ours am: 0ae129b16b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icc544bd8d119cb71a0cba90f3f76712b843d6f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 23:18:06 +00:00
Bill Yi
6298900b0d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb6de672dc -s ours am: 18386aec12 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icab1b982d80d1a2cb8eec0c2cdc7e4e302de43bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:56:41 +00:00
Bill Yi
c0ae45e1b9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a04e12bf -s ours am: 4944f6452d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2f51432d9fc1aa75e8c901d7b90f672882d05294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:56:22 +00:00
Bill Yi
c285f27d43 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ae1b6f1e35 -s ours am: 87f75cd497 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7d01d3129a7a8fbe8650f08640c2e14f778721cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:56:20 +00:00
Bill Yi
f280793591 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71c7b5f54c -s ours am: 21e791d44b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I476f44e76c2a06d1f3412c0dc3800123d3a55138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:56:17 +00:00
Bill Yi
ed197d04b1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ef269038ef -s ours am: 4541872412 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ide9bdf85b8d889a2748e5511f02e15090e90da6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:55:49 +00:00
Bill Yi
d6d007447c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c646d4394 -s ours am: 201aacead9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I52b623b1fc99d37975e1277bbdd2aa5c796be030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:55:29 +00:00
Bill Yi
f61d20ef0f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb6de672dc -s ours am: f9392111bb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8128802db4a5c9f9c92ff01372f0f1adaf0ec309
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:40:10 +00:00
Bill Yi
230ca0100e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a04e12bf -s ours am: 19a53a5241 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If22dfa5d81d441eede6d95103cab70f108bd9ffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:40:02 +00:00
Bill Yi
d7d5e57707 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ae1b6f1e35 -s ours am: bcafcba421 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic96e1fa7acb368e21ec0780bd51bf62f15f8792c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:40:00 +00:00
Bill Yi
df3b739286 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71c7b5f54c -s ours am: f0911b2572 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9b4e71b18a88400153c614c09f2036bf6b63eea8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:39:57 +00:00
Bill Yi
06b07322cd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ef269038ef -s ours am: ec6a532d98 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I41e03de20046af7ee9514166beb23be55fcc01ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:39:23 +00:00
Bill Yi
0ae129b16b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c646d4394 -s ours am: 7218d10694 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I428266076a6cc5613a7bf3a82e8e7b23d318159a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:39:08 +00:00
Bill Yi
18386aec12 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb6de672dc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3f4a40e2f42ffbdf43b3058928c79a7ccf16b302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:21:17 +00:00
Bill Yi
ae326b5f83 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb6de672dc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib5a8ee9b80ccb8f0c273639bb89ea0292bdcca12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:21:15 +00:00
Bill Yi
4944f6452d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a04e12bf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I77607e2174f573ce3680aadf6e53bdb410c77789
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:21:15 +00:00
Bill Yi
87f75cd497 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ae1b6f1e35 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icecbf29cc89b9b2766014ff5f45b8d8f99f4e119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:21:12 +00:00
Bill Yi
fc348ab76d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a04e12bf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I033f9c93563a42de2f66b95755d3a2065afde756
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:21:06 +00:00
Bill Yi
733d6f5579 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ae1b6f1e35 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia1f0dca00066d1b4f70e6ab25376e062febe7b1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:21:04 +00:00
Bill Yi
21e791d44b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71c7b5f54c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3ec1f3505fd6f8d9ea8a4d099a98b9abb73e2965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:20:58 +00:00
Bill Yi
f477d02f91 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71c7b5f54c -s ours
am skip reason: subject contains skip directive

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

Change-Id: If64d573e1afe581c8c74e53132b457e139e5b7d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:20:49 +00:00
Bill Yi
4541872412 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ef269038ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I22af454c706bc4587f28d8975e0a3acc253e7de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:20:39 +00:00
Bill Yi
e676a561d8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ef269038ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieff87595cbaef00ddd362c382f184b7cbbb12b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:20:32 +00:00
Bill Yi
201aacead9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c646d4394 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I55419a583c64e00be15d1113f6ab7da579c8bf85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:20:21 +00:00
Bill Yi
f537b87b7a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c646d4394 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic0761413dfee3b88b40f563eb0a9e5182bc2a7ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:20:13 +00:00
Bill Yi
f9392111bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb6de672dc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4d9d0f1a19122f51fcc8cce15cb4c0c0e76fd933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:16:26 +00:00
Bill Yi
19a53a5241 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a04e12bf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I25aaf4e993f96b9247b1efb8bd273a029378d576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:16:18 +00:00