PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,458 Commits 1 Branch 0 Tags
f122de33eff0fb2ea9e7dc2e5d53f967d13a75cc
Commit Graph

121458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
c3ad6f050d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1eb8b786fe -s ours am: e39eae202c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I093fc94b26a68ba0b90d7fd226dbb8b386674e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 19:41:51 +00:00
Bill Yi
18b54c93bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b25ac20f23 -s ours am: b546c56353 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e92e14ef05e11ba2529d4ee6be4e4607d1720c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 19:41:36 +00:00
Bill Yi
e3a4f68f6b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 85eeec4806 -s ours am: ebb5398309 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia99482b1d1fdc45b70dbc603e179eff725a3810f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 19:41:26 +00:00
Bill Yi
b6a93a192b Merge changes from topic "tc_change_23022712_26" into udc-dev am: cb44abff19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21606457

Change-Id: I6f3f550b8eb8508537647ba82c50b5fab705bb84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 19:11:25 +00:00
Bill Yi
f3086af940 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c42f31df9d am: 6f0694df62 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id8833359ae48495826b97628a588c7f94fb886e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 19:10:59 +00:00
Julia Reynolds
cf46c546ed Merge "Remove jank on DND schedule page" into udc-dev am: a0c9ce5b2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21650757

Change-Id: If0f70c2258324d4e19028819e8f1671d447dcfb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 19:00:00 +00:00
Julia Reynolds
f0bb4e8ce7 Merge "Remove jank on DND schedule page" into udc-dev am: a0c9ce5b2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21650757

Change-Id: If2c8d642016d0585dd66caf89e5d70a27ecd4e45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 18:59:22 +00:00
Bill Yi
b6dd507a32 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7ef6dedd46 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id4648c81a69a5aac58862a4afad43b2ad7dd82f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 18:52:27 +00:00
Bill Yi
c49b6a1709 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b6cd183ace -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id99929a3bb07cf3a6681d837f5bce3c01587451b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 18:52:20 +00:00
Bill Yi
385875e1bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 4798986201 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia6b883582a9046b0e4a6bb257b7c897aa2b63367
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 18:52:09 +00:00
Bill Yi
34a52ef593 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2c986d8aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a02c4fcb46a4591e66d78afedf3ce0bef5a10fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 18:51:24 +00:00
Bill Yi
cb44abff19 Merge changes from topic "tc_change_23022712_26" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c42f31df9d
  Import translations. DO NOT MERGE ANYWHERE
 2023-03-01 18:47:31 +00:00
Bill Yi
444be016ab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f6244e41d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic71a1a0bcb4a855a32974ce3130a7eb53f1c76d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 18:43:38 +00:00
Julia Reynolds
a0c9ce5b2f Merge "Remove jank on DND schedule page" into udc-dev 2023-03-01 18:43:11 +00:00
Bill Yi
e39eae202c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1eb8b786fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib1a758faebe9bca0f025db26015a873c9c5427e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 18:43:06 +00:00
Julia Reynolds
cb6a88b862 Remove jank on DND schedule page 
Only add/or remove preferences when absolutely needed.
Also fix a 'load data from backend' method that wasn't.

Fixes: 216747934
Test: ZenModeAutomaticRulesPreferenceControllerTest
Test: view schedules page
Test: add schedule
Test: remove schedule
Test: view schedule child page and return to schedules page
Change-Id: I237c2ca7ea89ee6e42354470a76712068a7f4dd7
 2023-03-01 18:43:02 +00:00
Bill Yi
b546c56353 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b25ac20f23 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I42b7fcbb27c07bd03fa97847b0065cb495f5f791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 18:41:59 +00:00
Bill Yi
ebb5398309 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 85eeec4806 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf92cc2364fb7a81737accef498c100799b253bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 18:41:06 +00:00
Bill Yi
c8a792e18f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f6244e41d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I90344f0269934add18c3b00d1579bf2a2ed329f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 18:38:46 +00:00
Bill Yi
85b5d74c9e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1eb8b786fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id53c7c29b385dbdebc29ef5665999f21701499c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 18:38:43 +00:00
Bill Yi
4d2f7b8349 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b25ac20f23 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia53f000b6b32467c7833105d35b2478fc7c59a04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 18:38:39 +00:00
Bill Yi
ae87762751 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 85eeec4806 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ief55e74ef141cdf5dfc67ce4b3be1d6cd1bbe0fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 18:37:27 +00:00
Bill Yi
f6244e41d4 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-03-01 18:12:33 +00:00
Bill Yi
b25ac20f23 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-03-01 18:12:33 +00:00
Vania Januar
c1429bcb40 Handle DEVICE_TYPE_STYLUS in advanced details header. 
Bug: 270654477
Test: AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: I725dd575ba56bf86e1336094961e769b81540479
 2023-03-01 17:22:15 +00:00
Bill Yi
b4dec8df46 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 839c6e88b4 -s ours am: ea2310e0fe -s ours am: 8ff2cfceab -s ours am: 1ae472af4d -s ours am: 8baecfab5c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie06abbe273cb33a98ff9a9b061cfd22c44f1b3c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 15:05:51 +00:00
Bill Yi
e02849b450 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d77ddd6ab3 -s ours am: 960eae9a2f -s ours am: cec67a1ee1 -s ours am: b3a751453e -s ours am: 2697dc29fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib6da7e993c54e8bacf203dfe7bdcfc20e3cc3b6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 15:05:49 +00:00
Bill Yi
581bcf009b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 798dd47215 -s ours am: 71ad7ad49e -s ours am: 3ba3148e2f -s ours am: 0d65b28b99 -s ours am: 5f755572b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4e234071cb87935453ef4f3162ed9795ec974762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 15:05:48 +00:00
Bill Yi
468069d4dd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff8ea95f2 -s ours am: 9de8ff63dd -s ours am: 75304e1ff5 -s ours am: 4594e953c7 -s ours am: f8126117fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f6817bbf2e1a234991d90701d2ba2c65fa8977d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 15:05:47 +00:00
Bill Yi
976b58694f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 586da77594 -s ours am: cac65afe79 -s ours am: 3d4d0267c6 -s ours am: a64f4a4585 -s ours am: b0cf8a0e4c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3b52b61282b4fb9a49d7e295252b37b3b84a012d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 15:05:46 +00:00
Bill Yi
2c34fd97dd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10e200b5ad -s ours am: d3fa508918 -s ours am: 858813dc33 -s ours am: 27cafd0dfa -s ours am: c663a47b28 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If87a4d916e5339234e8c017976831989c3cc567b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 15:04:28 +00:00
Ahaan Ugale
8d9121fd5b Merge "Update Autofill OWNERS" am: e35606efd3 am: b238ee99cc am: 96cb0fb4bd am: 9cc184e3cb am: bd9a87a9a0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2459329

Change-Id: Ic043a46c13b58770b274a66044f375de02758bd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 14:56:07 +00:00
Bill Yi
8baecfab5c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 839c6e88b4 -s ours am: ea2310e0fe -s ours am: 8ff2cfceab -s ours am: 1ae472af4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99e48c5a1d6b0da7b741ee6ba82018c308814617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 14:08:50 +00:00
Bill Yi
2697dc29fc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d77ddd6ab3 -s ours am: 960eae9a2f -s ours am: cec67a1ee1 -s ours am: b3a751453e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f814077dbc5cbcf3a68fc19a003bf6d1120d597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 14:08:48 +00:00
Bill Yi
5f755572b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 798dd47215 -s ours am: 71ad7ad49e -s ours am: 3ba3148e2f -s ours am: 0d65b28b99 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3bfa33a7c2ae8c26357f7d616104badfe370e9f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 14:08:43 +00:00
Bill Yi
3fa074e985 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 839c6e88b4 -s ours am: ea2310e0fe -s ours am: 8ff2cfceab -s ours am: 1ae472af4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia48dcb905bf4914fdb745bb8fb40bd803e220b28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 14:08:38 +00:00
Bill Yi
70d60b8130 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d77ddd6ab3 -s ours am: 960eae9a2f -s ours am: cec67a1ee1 -s ours am: b3a751453e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd373c6f9aa5398f7f3f816a078cc8756e9a7fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 14:08:35 +00:00
Bill Yi
f8126117fe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff8ea95f2 -s ours am: 9de8ff63dd -s ours am: 75304e1ff5 -s ours am: 4594e953c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I909f40b5fa690beb258733eb0f71e63f3d19f0c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 14:08:29 +00:00
Bill Yi
97f2103ab2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 798dd47215 -s ours am: 71ad7ad49e -s ours am: 3ba3148e2f -s ours am: 0d65b28b99 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0294bd9b55a34469f17968e07bde27d1e78b5b9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 14:08:27 +00:00
Bill Yi
1898979be7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff8ea95f2 -s ours am: 9de8ff63dd -s ours am: 75304e1ff5 -s ours am: 4594e953c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic11ff1e699b1064967985643a3a30672295ee455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 14:08:12 +00:00
Bill Yi
b0cf8a0e4c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 586da77594 -s ours am: cac65afe79 -s ours am: 3d4d0267c6 -s ours am: a64f4a4585 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If03edb8b429c4caeb6d04327da85c0103149eb26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 14:08:10 +00:00
Bill Yi
c663a47b28 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10e200b5ad -s ours am: d3fa508918 -s ours am: 858813dc33 -s ours am: 27cafd0dfa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0e33c628a9fd8b3fb86d9a5016de9b429ca3f503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 14:07:55 +00:00
Bill Yi
c18b5b610a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 586da77594 -s ours am: cac65afe79 -s ours am: 3d4d0267c6 -s ours am: a64f4a4585 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I824fd61281e481ce7d5b181804809b738b989b0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 14:07:51 +00:00
Bill Yi
4a6f525aa5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10e200b5ad -s ours am: d3fa508918 -s ours am: 858813dc33 -s ours am: 27cafd0dfa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7a44823988e1652781448f48fe99726b93167aea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 14:07:42 +00:00
Ahaan Ugale
bd9a87a9a0 Merge "Update Autofill OWNERS" am: e35606efd3 am: b238ee99cc am: 96cb0fb4bd am: 9cc184e3cb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2459329

Change-Id: I5e7c61c7d8e1d52fa1a43f3283fb15b71dad4f53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 14:03:11 +00:00
Ahaan Ugale
4520667b1e Merge "Update Autofill OWNERS" am: e35606efd3 am: b238ee99cc am: 96cb0fb4bd am: 9cc184e3cb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2459329

Change-Id: Ic3ef69f71f3a2c5687b8477f406d7cb951b4baa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 14:02:15 +00:00
Bill Yi
1ae472af4d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 839c6e88b4 -s ours am: ea2310e0fe -s ours am: 8ff2cfceab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I941045893ccc6416a3e03a22649c18b11cbd29ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 13:48:28 +00:00
Bill Yi
b3a751453e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d77ddd6ab3 -s ours am: 960eae9a2f -s ours am: cec67a1ee1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iffc3044f1a63cc3ad0796b8a0f0b6ac417702d49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 13:48:24 +00:00
Bill Yi
0d65b28b99 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 798dd47215 -s ours am: 71ad7ad49e -s ours am: 3ba3148e2f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I032598c0d5b828a33e163230ad1e662491305060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 13:48:22 +00:00
Bill Yi
4594e953c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff8ea95f2 -s ours am: 9de8ff63dd -s ours am: 75304e1ff5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I516ca07faca199635bff4c186950effd7216deff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-01 13:48:19 +00:00