PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,846 Commits 1 Branch 0 Tags
c14d26462b7b41301a759506f2f799db03ef1c8c
Commit Graph

123846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Norman
c14d26462b Adds TEST_MAPPING for Settings > Accessibility unit tests. 
This initial TEST_MAPPING file is postsubmit only until we validate
which tests are stable enough to be moved to presubmit and which need
fixes.

Bug: 267225211
Test: atest --test-mapping packages/apps/Settings/src/com/android/settings/accessibility
Change-Id: I5e5f337d4ea7618ab92d3daa5171fd8ee1508c59
 2023-04-20 22:04:11 +00:00
Yuxin Hu
fd5aaae591 Merge "Add permission to use GPU service APIs" into udc-dev am: 76e769cdb0 am: 77b9ebf525 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22638748

Change-Id: I42c582cceb36b02aa28013ccfe5fad19435d233e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 21:27:42 +00:00
Yuxin Hu
09f0850e96 Merge "Add permission to use GPU service APIs" into udc-dev am: 76e769cdb0 am: 518a3ae57a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22638748

Change-Id: Ifd8fe23c5ca7c449c96cea037f40f959d863d0fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 21:24:51 +00:00
Yuxin Hu
518a3ae57a Merge "Add permission to use GPU service APIs" into udc-dev am: 76e769cdb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22638748

Change-Id: Ib87b1532a8256e18529d665378f56c0033e9cc35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 21:23:19 +00:00
Yuxin Hu
77b9ebf525 Merge "Add permission to use GPU service APIs" into udc-dev am: 76e769cdb0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22638748

Change-Id: I61ce5d1606e66479820abf0a15efc390dba80cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 21:20:18 +00:00
Tetiana Meronyk
4c154e46f9 Merge "Add confirmation dialog when granting/revoking admin privileges." into udc-dev am: 84da171439 am: be328cb743 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22618756

Change-Id: I92551fdfd9d773dc119acb9514300b60c0dffd3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 21:18:55 +00:00
Ken Lin
4c656299f6 Merge "Smooth Display description error" into udc-dev am: 24a5a1c824 am: 947f9f2553 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22693748

Change-Id: I46a6a3116f44af9d3a606179e0d245044c0475d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 21:18:45 +00:00
Elliot Sisteron
499ba9e01e Merge "Launch work profile entries intent in the profile parent." into udc-dev am: 0a506448b8 am: 18fd113737 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22714062

Change-Id: I1878712b0021bf3a956089c8acc827d08ec3a226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 21:18:35 +00:00
Treehugger Robot
c74f701df1 Merge "Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..."" into udc-dev am: 8609ef2291 am: 72823d814d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753624

Change-Id: I97fa5e2718dd50e0a6aec55896c0c25f966008b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 21:18:25 +00:00
Treehugger Robot
64deaeb45a Merge "Update the proper App battery usage string on App info page" into udc-dev am: bc67d885ec am: 36ed86a6c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753622

Change-Id: I00f6025e1ce9b4357b44c6464103db4d14a08238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 21:18:16 +00:00
ykhung
8e6f2692bb Update battery tip main icon into materiel theme design am: ff65a02ff8 am: 89573cd826 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22746582

Change-Id: Idaaa44c7ab24e3bd0edb988e5dbfd8431f65a9a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 21:18:06 +00:00
Karishma Vakil
b67101e16c Merge "[Safety Labels] Enable safety label change notifications flag by default in Settings code" into udc-dev am: 85e5174132 am: 9ae6caac07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22748283

Change-Id: I69fa99bfaf51ae201a0179985e4ac3f8556b8430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 21:17:57 +00:00
Chaohui Wang
54aabaa433 Merge "Fix button label missing in the SIM card pop ups" into udc-dev am: ac2dc8dd01 am: 7d063294d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22731782

Change-Id: Ifd85fb7ca476686a063fbaced41a67ac5a17d35e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 21:17:47 +00:00
TreeHugger Robot
702aa8c722 Merge "[BiometricsV2] Fix fingerprint add another fail" into udc-dev am: d21225790b am: 63b579aa52 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22740561

Change-Id: Ic57b40d285f05f80a0ac397fdaf162e57883d54b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 21:16:39 +00:00
TreeHugger Robot
f62db238b6 Merge "Fix RTL display problem in Open by default" into udc-dev am: fb52240afe am: 0b2f7c967a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700244

Change-Id: I5d3cebeaa146891ec999f0d971e8c916815c3446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 21:01:10 +00:00
Becca Hughes
8d5f298e62 [automerger skipped] DO NOT MERGE Live update cred man settings am: d8b74b5c39 am: 5f5c6ed682 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3fb40a055042d7ecafc9e7f6e7383a0f370f773
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:58:48 +00:00
Tetiana Meronyk
401b7163f8 Merge "Add confirmation dialog when granting/revoking admin privileges." into udc-dev am: 84da171439 am: e9fb9058cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22618756

Change-Id: If21d1e0f59eeed20ff322c47052b793a4fe07774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:54:08 +00:00
Ken Lin
cd1ef6ece1 Merge "Smooth Display description error" into udc-dev am: 24a5a1c824 am: da1c577123 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22693748

Change-Id: I60077dbfcd07cef1cad1e54ed03573119db21eed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:53:57 +00:00
Elliot Sisteron
e5c08f5ed4 Merge "Launch work profile entries intent in the profile parent." into udc-dev am: 0a506448b8 am: 031cefc969 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22714062

Change-Id: Idb49021702af5a1a71409f6d9ef5a16ed69b381a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:53:48 +00:00
Treehugger Robot
68c9175e02 Merge "Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..."" into udc-dev am: 8609ef2291 am: 533e6d80e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753624

Change-Id: I345f4b068ff3cd4f371d6ee9f69b4b26de1abf8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:53:38 +00:00
Treehugger Robot
c2c783ef17 Merge "Update the proper App battery usage string on App info page" into udc-dev am: bc67d885ec am: d5f6278e49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753622

Change-Id: I6d3e0541db7d4c04d5c72f5606a20b7e956ad2b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:53:29 +00:00
ykhung
c80cc83b88 Update battery tip main icon into materiel theme design am: ff65a02ff8 am: a756df402f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22746582

Change-Id: Ic0cad0444c3d895334e972947b271dbe53687625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:53:19 +00:00
Karishma Vakil
4e9381bdd7 Merge "[Safety Labels] Enable safety label change notifications flag by default in Settings code" into udc-dev am: 85e5174132 am: f8fe3d4bcc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22748283

Change-Id: I68458725ebdbaf8ee6f88b4b27d3c070854008f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:53:08 +00:00
Chaohui Wang
3da7ecc4a4 Merge "Fix button label missing in the SIM card pop ups" into udc-dev am: ac2dc8dd01 am: 95cb923575 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22731782

Change-Id: I63ecd391ab3b962d92792eeaf475572fbaf82e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:52:59 +00:00
TreeHugger Robot
a4ca093e8a Merge "[BiometricsV2] Fix fingerprint add another fail" into udc-dev am: d21225790b am: 87d7e0f59a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22740561

Change-Id: I9c905176f89cd58b9987a857642a149a2a0fd14e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:52:50 +00:00
TreeHugger Robot
01cea04949 Merge "Fix RTL display problem in Open by default" into udc-dev am: fb52240afe am: 168534ecb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700244

Change-Id: I69669fcd858f08a294739d538ea905fdde92f089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:52:41 +00:00
Becca Hughes
5cb02ab0c5 [automerger skipped] DO NOT MERGE Live update cred man settings am: d8b74b5c39 am: 6dbc9554da -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If94e5c193721f884e93c3d2fa1c434f4ffe4349d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:50:48 +00:00
Bill Yi
941b453261 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 367bedb886 -s ours am: 3e8d5a6747 -s ours am: c205fe957a -s ours am: c95d152465 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib536fbfdb444a8244e255a738b69be70645f8e90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:49:33 +00:00
Bill Yi
660c30d525 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 367bedb886 -s ours am: 3e8d5a6747 -s ours am: c205fe957a -s ours am: 36502b6afe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id9a4358ef6aeeda6f8892dc55463eddf6f4d2977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:39:12 +00:00
Julia Tuttle
38cd43dadd Merge "Clarify full screen intent permission text" into udc-dev am: 8af4cf48ea am: 57b70c2c01 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22680610

Change-Id: I3de54cfcc99774a0c97db1e2babd090462e19355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:37:18 +00:00
Julia Tuttle
e5cbf9f05f Merge "Clarify full screen intent permission text" into udc-dev am: 8af4cf48ea am: e81af0ad4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22680610

Change-Id: Ibe6ccc182416e42ff5ab8c1ebff1639eb742ff0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:19:11 +00:00
Tetiana Meronyk
be328cb743 Merge "Add confirmation dialog when granting/revoking admin privileges." into udc-dev am: 84da171439 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22618756

Change-Id: I9ea8083d6b24522f8771977a15d4e06d3059d204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:15:02 +00:00
Bill Yi
1fca37e570 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b660ca5570 -s ours am: 34a76b5ade -s ours am: e69c91f7e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I85cd93c940465a1e3bc6d5e460ca505656d92b92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:14:56 +00:00
Tetiana Meronyk
e9fb9058cb Merge "Add confirmation dialog when granting/revoking admin privileges." into udc-dev am: 84da171439 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22618756

Change-Id: I515ad42531ade8e3171a8f5489a95af9a0d247d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:13:26 +00:00
Ken Lin
947f9f2553 Merge "Smooth Display description error" into udc-dev am: 24a5a1c824 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22693748

Change-Id: Ia06e9e7f22400e884bd3effdb6995564f2b116df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:12:54 +00:00
Elliot Sisteron
18fd113737 Merge "Launch work profile entries intent in the profile parent." into udc-dev am: 0a506448b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22714062

Change-Id: I937ff5894ffb7f000824044981cedc3b2eb63080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:12:44 +00:00
Treehugger Robot
72823d814d Merge "Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..."" into udc-dev am: 8609ef2291 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753624

Change-Id: Ib73a0321690d7b5f62125052b40497a0c4dbadbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:12:34 +00:00
Treehugger Robot
36ed86a6c5 Merge "Update the proper App battery usage string on App info page" into udc-dev am: bc67d885ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753622

Change-Id: Ifa36325db77fe06b13ec95310b07b2df03d4ce29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:12:17 +00:00
ykhung
89573cd826 Update battery tip main icon into materiel theme design am: ff65a02ff8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22746582

Change-Id: I29e3e2aeff9595443fbb83be7ef7a2f95a4aa475
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:12:08 +00:00
Karishma Vakil
9ae6caac07 Merge "[Safety Labels] Enable safety label change notifications flag by default in Settings code" into udc-dev am: 85e5174132 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22748283

Change-Id: Id06452bb09dd23cbaa2e6803ec92c0cb293a7f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:12:01 +00:00
Chaohui Wang
7d063294d8 Merge "Fix button label missing in the SIM card pop ups" into udc-dev am: ac2dc8dd01 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22731782

Change-Id: Ib03b3040068455718a580b59d288390e0ef4d37a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:11:52 +00:00
TreeHugger Robot
63b579aa52 Merge "[BiometricsV2] Fix fingerprint add another fail" into udc-dev am: d21225790b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22740561

Change-Id: I3fea57afdfaafdfe7a96fa82c28c86c4f68a91ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:11:43 +00:00
TreeHugger Robot
0b2f7c967a Merge "Fix RTL display problem in Open by default" into udc-dev am: fb52240afe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700244

Change-Id: I27756cc3637a0e3a841e9a07303685e774b3f350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:11:33 +00:00
Becca Hughes
5f5c6ed682 DO NOT MERGE Live update cred man settings am: d8b74b5c39 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22746581

Change-Id: I30fa4a6571c425085144a6b78362c15ac51745c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:11:23 +00:00
Ken Lin
da1c577123 Merge "Smooth Display description error" into udc-dev am: 24a5a1c824 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22693748

Change-Id: Ie61fa29667009f338bdcb73d6139c3a7671fadec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:11:20 +00:00
Elliot Sisteron
031cefc969 Merge "Launch work profile entries intent in the profile parent." into udc-dev am: 0a506448b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22714062

Change-Id: Ied70d69250fb0ec3ae4cd523661f72b7e22670c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:11:08 +00:00
Treehugger Robot
533e6d80e9 Merge "Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..."" into udc-dev am: 8609ef2291 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753624

Change-Id: I731c73fdc88460f1523ff77f507b42ef5322c3ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:10:56 +00:00
Treehugger Robot
d5f6278e49 Merge "Update the proper App battery usage string on App info page" into udc-dev am: bc67d885ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753622

Change-Id: I42bf2bfc4918f9a9388495b87e37137fc9324adb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:10:42 +00:00
ykhung
a756df402f Update battery tip main icon into materiel theme design am: ff65a02ff8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22746582

Change-Id: I994b044a35bf08864cf944698809881a3c0468d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:10:30 +00:00
Bill Yi
36502b6afe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 367bedb886 -s ours am: 3e8d5a6747 -s ours am: c205fe957a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia797c4eca1ad0591509d48c3e892da86dd5f37a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:10:29 +00:00