PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,472 Commits 1 Branch 0 Tags
b4b54ad1e78d2a4bde650f1422f49fb7513b83c6
Commit Graph

124472 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
b4b54ad1e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efc9e1994c -s ours am: 9abc703e40 -s ours am: 49103dfc2e -s ours am: e62b917856 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic2f26a3b3439734358695de7f92d45a21eb100f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:15:12 +00:00
Bill Yi
94ad3348b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 171e66e000 -s ours am: 4caa1ee4c3 -s ours am: 155b5266fc -s ours am: f9ffefd7d6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8222b6716e1a709a7c00147315a3fa3636d59814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:14:52 +00:00
Bill Yi
598481dc76 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c416adc1df -s ours am: d4ba4def6a -s ours am: 0ebc9d790d -s ours am: d0e1438572 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f69589b68b55c89846c2c69c9b61db8709946fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:14:46 +00:00
Bill Yi
45808ae4a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 499308fa2c -s ours am: dcd5353e67 -s ours am: a70fa93e6b -s ours am: 58119147f3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea2ea036cf7265564c10c6fe58f7f27cdcf3a136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:14:35 +00:00
Bill Yi
a3fc319181 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a05355cc0a -s ours am: 22ac363063 -s ours am: 340b85bb5b -s ours am: cb6e618de8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic0da7cce7b1078677ccbf143b3d010298d989afd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:14:14 +00:00
Treehugger Robot
875b1be363 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766 -s ours am: 0cb641a695 -s ours am: 46bd7feab6 -s ours am: 304324ddd0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife399de8a85dbc27a4246d62dacf8b272f455e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:11:21 +00:00
Treehugger Robot
55c2d095cf Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp am: 953f6167e9 am: 0b8d81c18c am: c4241ce611 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019

Change-Id: I6169c4ed513ae43ab30e9764b0d54ad96fffb95c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:10:48 +00:00
Piotr Wilczyński
23ef7e7a3b Merge "Revert "Back up the smooth display setting"" into udc-d1-dev am: 0066bdea3e am: 1ab96c0b22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848698

Change-Id: Iede2011f75063ca25002cbabf819f8a66ffa690f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 22:09:42 +00:00
Julia Tuttle
ff3d30a9b4 Merge "Update FSI permission strings" into udc-dev am: 2094622da9 am: ce59e1ea97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899255

Change-Id: I7733171ec9db9f522bba6dad727cb766f178d4d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 21:34:15 +00:00
Becca Hughes
427665a90a [automerger skipped] Merge "DO NOT MERGE Hide provider from this list if autofill provider" into udc-dev am: c74ccee659 am: 859df31fab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2bc4d88c3619d37ccf7f27bf09d9de6dfbb7c393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 21:21:58 +00:00
Becca Hughes
f166cb9796 [automerger skipped] DO NOT MERGE Hide provider from this list if autofill provider am: 99f1d5448d am: 3107fb0f96 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia35448dcdd12c68b89be1a32e8107103a8f3da94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 21:15:59 +00:00
Becca Hughes
58105270d7 [automerger skipped] Merge "DO NOT MERGE Listen for updates to autofill/credman provider" into udc-dev am: 4fc5b0e7b3 am: 6df62b695c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia5921ff3db32de96dcec26c8a8c84badee51a3f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 21:06:31 +00:00
Becca Hughes
b1b6edc4dc [automerger skipped] DO NOT MERGE Listen for updates to autofill/credman provider am: 688b023d09 am: 7378d6c66c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I546ea077e306c793cc57ac9bb96dccd584db4f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 21:05:55 +00:00
Piotr Wilczyński
9797fc8d15 Merge "Revert "Back up the smooth display setting"" into udc-d1-dev am: 0066bdea3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848698

Change-Id: I3f3058996ac6418ce8df4e888b0959830276ac31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 20:53:05 +00:00
Julia Tuttle
ce59e1ea97 Merge "Update FSI permission strings" into udc-dev am: 2094622da9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899255

Change-Id: Id797e3f7b2f1dec78f0bc529da0156393a27d2be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 20:48:39 +00:00
TreeHugger Robot
bb49ef02f9 Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev am: 32602794ed am: d1ebd886db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885040

Change-Id: I7007257549a53aabbede5faed635066bb8f82a85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 20:22:15 +00:00
Julia Tuttle
2094622da9 Merge "Update FSI permission strings" into udc-dev 2023-04-27 20:03:56 +00:00
TreeHugger Robot
d1ebd886db Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev am: 32602794ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885040

Change-Id: I7a91a1346cdfa2a7ac1c37a99e5c109e05ec3088
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 19:25:45 +00:00
TreeHugger Robot
32602794ed Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev 2023-04-27 18:55:20 +00:00
Julia Tuttle
b2fd7b20c7 Update FSI permission strings 
Change them to better align with the other "Special app access" screens.

Bug: 277938620
Test: none
Change-Id: I0083a207a9c8cf98d1b5a9927a1f8bf024832697
 2023-04-27 14:02:01 -04:00
Becca Hughes
b19c1499f6 [automerger skipped] Merge "DO NOT MERGE Hide provider from this list if autofill provider" into udc-dev am: c74ccee659 am: 9a1743f99d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife1c60681b1d98db8620b6b51081d950a14b5b05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:59:08 +00:00
Becca Hughes
89a7c5737a [automerger skipped] DO NOT MERGE Hide provider from this list if autofill provider am: 99f1d5448d am: 2083d07121 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I23f386f3570e679fdfecc48144f0783e35d8c67a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:57:35 +00:00
Becca Hughes
19b3c28e29 [automerger skipped] Merge "DO NOT MERGE Listen for updates to autofill/credman provider" into udc-dev am: 4fc5b0e7b3 am: 4c481b04c8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0d7e2df7f9689d5bb2ba8a4caaf9b5bab6b92ed8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:56:50 +00:00
Becca Hughes
03c9849f70 [automerger skipped] DO NOT MERGE Listen for updates to autofill/credman provider am: 688b023d09 am: 76e5f7fac4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I10ddee3cfc402e483cfedafca2e6fb7b1cdc7352
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:55:48 +00:00
Becca Hughes
9a1743f99d Merge "DO NOT MERGE Hide provider from this list if autofill provider" into udc-dev am: c74ccee659 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839

Change-Id: I9b3744d2a589a171e77a6aa08439ffd12afc807f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:15:57 +00:00
Becca Hughes
2083d07121 DO NOT MERGE Hide provider from this list if autofill provider am: 99f1d5448d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839

Change-Id: I5546461c6bb87b94dbf2d525e223e83b88b5d3f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:15:52 +00:00
Becca Hughes
859df31fab Merge "DO NOT MERGE Hide provider from this list if autofill provider" into udc-dev am: c74ccee659 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839

Change-Id: I0c2ed2c4f1fc8763cae49572f75d8871b5e48ab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:11:41 +00:00
Becca Hughes
3107fb0f96 DO NOT MERGE Hide provider from this list if autofill provider am: 99f1d5448d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839

Change-Id: Ifde2d297be711a957ce900ec5c7f1d30601bc6ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:11:36 +00:00
Becca Hughes
4c481b04c8 Merge "DO NOT MERGE Listen for updates to autofill/credman provider" into udc-dev am: 4fc5b0e7b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22764836

Change-Id: Ic5994457b10d61f254e2c0efab6a6c4ff8d76822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:06:55 +00:00
Becca Hughes
76e5f7fac4 DO NOT MERGE Listen for updates to autofill/credman provider am: 688b023d09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22764836

Change-Id: Ia265b8c5cca1a6207ef7ba61342d66eb44db2373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:06:50 +00:00
Becca Hughes
6df62b695c Merge "DO NOT MERGE Listen for updates to autofill/credman provider" into udc-dev am: 4fc5b0e7b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22764836

Change-Id: I78f3ef0ab0e136e5e037b077fb993ebd9df8ef55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:04:37 +00:00
Becca Hughes
7378d6c66c DO NOT MERGE Listen for updates to autofill/credman provider am: 688b023d09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22764836

Change-Id: I2c3cdf15907f2e6e2a40a2547b9b6b92cdcfd35c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:04:31 +00:00
Bill Yi
e62b917856 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efc9e1994c -s ours am: 9abc703e40 -s ours am: 49103dfc2e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie36e50990b19eaaff5c7f9d0e53d23e3e60d9454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 16:48:41 +00:00
Bill Yi
f9ffefd7d6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 171e66e000 -s ours am: 4caa1ee4c3 -s ours am: 155b5266fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0a3acb47faeb2cc0b7029d37d43839046648ec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 16:48:38 +00:00
Bill Yi
d0e1438572 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c416adc1df -s ours am: d4ba4def6a -s ours am: 0ebc9d790d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id286a20a0b0cde92120577a575c306cc018618b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 16:48:34 +00:00
Bill Yi
58119147f3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 499308fa2c -s ours am: dcd5353e67 -s ours am: a70fa93e6b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieecc5e87d441256e3af44bbb202a9d116acda300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 16:48:27 +00:00
Bill Yi
cb6e618de8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a05355cc0a -s ours am: 22ac363063 -s ours am: 340b85bb5b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I78a336675daab779f66653a3ec350073a2d6065a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 16:48:17 +00:00
Treehugger Robot
304324ddd0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766 -s ours am: 0cb641a695 -s ours am: 46bd7feab6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I95c2b229ea2e32882a999b6e9e16b5d68f3bece8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 16:46:12 +00:00
Treehugger Robot
c4241ce611 Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp am: 953f6167e9 am: 0b8d81c18c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019

Change-Id: I2b3ca860ca03f35c5ef2e3c1bbd3b77cbfb04724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 16:45:53 +00:00
Becca Hughes
c74ccee659 Merge "DO NOT MERGE Hide provider from this list if autofill provider" into udc-dev 2023-04-27 16:35:18 +00:00
Becca Hughes
4fc5b0e7b3 Merge "DO NOT MERGE Listen for updates to autofill/credman provider" into udc-dev 2023-04-27 16:35:07 +00:00
Piotr Wilczyński
1ab96c0b22 Merge "Revert "Back up the smooth display setting"" into udc-d1-dev am: 0066bdea3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848698

Change-Id: I26bb2b04a543a22c619387ec41ae26e37f63aa8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 16:08:45 +00:00
Bill Yi
49103dfc2e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efc9e1994c -s ours am: 9abc703e40 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I370319fcbc37e1a632a2e8a6d20083ece4b69566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 16:07:43 +00:00
Bill Yi
155b5266fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 171e66e000 -s ours am: 4caa1ee4c3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If51f800f04ad40049ee3508ff02d9ded8cf7f7b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 16:07:37 +00:00
Bill Yi
0ebc9d790d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c416adc1df -s ours am: d4ba4def6a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie6058d58565c8b9f65cc7cb5a61b1367141dd17b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 16:07:30 +00:00
Bill Yi
a70fa93e6b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 499308fa2c -s ours am: dcd5353e67 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib6beab44e6862b85e5a5ebb28f9573b894a69dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 16:07:19 +00:00
Bill Yi
340b85bb5b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a05355cc0a -s ours am: 22ac363063 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb3db0d1797033ce2854741532be1f0eb32823fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 16:06:56 +00:00
Piotr Wilczyński
0066bdea3e Merge "Revert "Back up the smooth display setting"" into udc-d1-dev 2023-04-27 16:06:37 +00:00
Treehugger Robot
46bd7feab6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766 -s ours am: 0cb641a695 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1943d52ba4d0aa955897e823a3860ef619d98915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 16:05:02 +00:00
Treehugger Robot
0b8d81c18c Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp am: 953f6167e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019

Change-Id: I6372af8e100d0ab6d7709cc180c13efce4ff40fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 16:04:44 +00:00