PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
132,526 Commits 1 Branch 0 Tags
56d26ff56c01dfbafeb36c3effaa867a5af9ea3b
Commit Graph

132526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chun-Wei Wang
56d26ff56c Merge changes from topic "simplify_pw" into udc-qpr-dev am: e414d40e60 am: 3f4b3fdce8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23840849

Change-Id: I3e2974a91c86aecf459ce51f9afdbf6175b8faed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-18 02:36:44 +00:00
Chun-Wei Wang
3f4b3fdce8 Merge changes from topic "simplify_pw" into udc-qpr-dev am: e414d40e60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23840849

Change-Id: I900a6743122d4c9d514cfb2d406aafb793faead3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-18 01:49:43 +00:00
Chun-Wei Wang
e414d40e60 Merge changes from topic "simplify_pw" into udc-qpr-dev 
* changes:
  Handle EXTRA_KEY_REQUEST_WRITE_REPAIR_MODE_PW
  Extract common code to SaveChosenLockWorkerBase
 2023-07-18 01:17:13 +00:00
Chun-Wei Wang
c726bd48b4 Handle EXTRA_KEY_REQUEST_WRITE_REPAIR_MODE_PW 
So the new password can be saved per caller's request.

This will remove the additional step to ask the user
to enter the new credential again and thus simplifying
the UI flow.

Bug: 271968977
Bug: 277561275
Test: atest SettingsUnitTests:SaveAndFinishWorkerTest
Test: atest ChooseLockPasswordTest
Change-Id: I20232619225b17edda0a72dad43b120d5a249203
 2023-07-17 23:04:45 +00:00
Treehugger Robot
56a76c7038 Merge "Show LE audio toggle in Device Detail by default" into udc-qpr-dev am: 2fdc9c943b am: f07e5f7520 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002323

Change-Id: I642988621d5e208cf5acbab6e88ecd3fdae45e41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 22:18:35 +00:00
Chaohui Wang
55aa137321 [automerger skipped] Merge "[BT] Correct the filter when addCachedDevices" into udc-qpr-dev am: 683296f180 am: 9e62a492f4 -s ours 
am skip reason: Merged-In I95b16840881747ec9f69e5cd778e456bcc8a7626 with SHA-1 8dd32ab07d is already in history

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

Change-Id: I8cc27a9fc1f31fcadd7822acbc04e766b7839ff5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 22:15:49 +00:00
Chun-Wei Wang
80d348e343 Merge changes If96ac99a,I45ab17cf into udc-qpr-dev am: 394baf2919 am: dc02e7cbf2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24059809

Change-Id: I413fd5b6323c32438574ec609edc1a80ae0094cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 21:52:16 +00:00
Bill Yi
df022f13ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 1e86da303c -s ours am: c4fdbfe95d -s ours am: 3d87ba08ba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iab5ecf41988d182f7f3f32e3d62161a3674961dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 20:20:35 +00:00
Bill Yi
43b55a3d8a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 80172630a4 -s ours am: a4f2a82d44 -s ours am: 1194c09396 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I773624c7c289e6c717239d661bd30f2e0038c844
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 19:51:00 +00:00
Bill Yi
50c2cf042a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2764a59fac -s ours am: ef607acf40 -s ours am: 8695b7f2fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If10e4dfcd075ed56e2d6e060b9efd335af3e7f07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 19:50:41 +00:00
Bill Yi
ed4769a083 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 1e86da303c -s ours am: 72295da2e5 -s ours am: d704d74ed9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3f70f7c3f954f00ca7c76ef8e1c943a06b7a86a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 19:32:37 +00:00
Automerger Merge Worker
8d8ecf1051 Merge changes from topic "am-c46e753e59a04ec0be6cb1735ffa925e" into udc-qpr-dev-plus-aosp am: 8d18c44b4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24075805

Change-Id: Idd02a3b67ec36a2f785819d0565c174cd0c99cca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 19:29:02 +00:00
Bill Yi
3661791ece [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2531d5736b -s ours am: 734ddee1de -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I95bd92435a6099ea0c583ac5346cde9503750697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 19:28:42 +00:00
Automerger Merge Worker
729874bb31 Merge changes from topic "am-6f9e4022de18455493ebda8b0cfe7548" into udc-d1-dev-plus-aosp am: b273d4ce5e am: 7a561f02d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069343

Change-Id: I48322962b6936c2af84f2bf7cb74d2e84a188fff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 19:08:25 +00:00
Bill Yi
d0953b8aaa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 80172630a4 -s ours am: 4249011ef2 -s ours am: 4bd8c55370 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5912f18bf6e6f454e12232d6525a896fa9d3595f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 19:08:05 +00:00
Automerger Merge Worker
511f747194 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 208c74fa3c -s ours am: 25fabc93a5 -s ours" into udc-qpr-dev-plus-aosp am: 919797970e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82ab482da6cc85e2089c75945a982636562f20b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 19:02:42 +00:00
Bill Yi
a4934cbb9a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 208c74fa3c -s ours am: 25fabc93a5 -s ours am: 94d5c18859 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5972120a9efacba665102e29fc028854f4c14008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 19:02:28 +00:00
Bill Yi
75ee9ec4da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours am: 1ff28d9c1a -s ours am: 0cc5a16f95 -s ours am: 797d51f7cb -s ours am: 324f9dc0ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I48eeb3347548026671429943809138822d1d9d09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 18:42:43 +00:00
Bill Yi
b28521a13a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours am: 1ff28d9c1a -s ours am: f74197dd3c -s ours am: c69e38797c -s ours am: 7c58a2edb3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82a0d9b807eebb758a0db098259abb848c87baba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 18:40:16 +00:00
Bill Yi
53f84aea6f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours am: 1ff28d9c1a -s ours am: 0cc5a16f95 -s ours am: a5dc181d3c -s ours am: 05aa8c0efd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic329539026d3a1033ad94378c1d046e4c339a7d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 18:19:13 +00:00
Shivangi Dubey
b5a6c7a020 Merge "Add 'Stay unlocked on fold' toogle to settings" into udc-qpr-dev am: 8c68b0e7e2 am: 32d914ea56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23832963

Change-Id: I340d008ea78939a614e8b33f83c212421d4388d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 16:48:24 +00:00
Treehugger Robot
f07e5f7520 Merge "Show LE audio toggle in Device Detail by default" into udc-qpr-dev am: 2fdc9c943b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002323

Change-Id: I7006714cd6b249f8dc791703c3daaddb0ade2f8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 03:42:18 +00:00
Treehugger Robot
2fdc9c943b Merge "Show LE audio toggle in Device Detail by default" into udc-qpr-dev 2023-07-17 03:34:51 +00:00
Chaohui Wang
9e62a492f4 Merge "[BT] Correct the filter when addCachedDevices" into udc-qpr-dev am: 683296f180 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025004

Change-Id: I342823c900601345cd622bf7e0b0aab0879b9799
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 03:18:43 +00:00
Chaohui Wang
683296f180 Merge "[BT] Correct the filter when addCachedDevices" into udc-qpr-dev 2023-07-17 02:36:29 +00:00
Bill Yi
de9926a79b Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-07-15 00:10:25 +00:00
Chun-Wei Wang
dc02e7cbf2 Merge changes If96ac99a,I45ab17cf into udc-qpr-dev am: 394baf2919 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24059809

Change-Id: I6060123ce095b259e8b63b808eb0c7ef52463402
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 23:06:02 +00:00
Chun-Wei Wang
394baf2919 Merge changes If96ac99a,I45ab17cf into udc-qpr-dev 
* changes:
  Remove invalid test
  Remove invalid test
 2023-07-14 22:18:19 +00:00
Bill Yi
3d87ba08ba [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 1e86da303c -s ours am: c4fdbfe95d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8b6b91b0968e865accab0e6075266b39cf4fa375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 21:06:33 +00:00
Bill Yi
1194c09396 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 80172630a4 -s ours am: a4f2a82d44 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I047c57ed74bb390d8f8613ca94a948877b4638e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 21:02:26 +00:00
Bill Yi
8695b7f2fa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2764a59fac -s ours am: ef607acf40 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6499598a26e7026aaf3d0c63d9635a6c58a72591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 21:02:04 +00:00
Bill Yi
d704d74ed9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 1e86da303c -s ours am: 72295da2e5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0fbdc8ded00fb5c0178b3e8692d485f591288d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:58:03 +00:00
Automerger Merge Worker
8d18c44b4f Merge changes from topic "am-c46e753e59a04ec0be6cb1735ffa925e" into udc-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2531d5736b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f21bb3ba0 -s ours
 2023-07-14 20:56:42 +00:00
Automerger Merge Worker
7a561f02d5 Merge changes from topic "am-6f9e4022de18455493ebda8b0cfe7548" into udc-d1-dev-plus-aosp am: b273d4ce5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24069343

Change-Id: I2cecedafa4cadeb6d0b14a1df802dfc00793dab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:54:29 +00:00
Bill Yi
4bd8c55370 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 80172630a4 -s ours am: 4249011ef2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If63f6a02d81c97c0e3e2bd144ccdace9493ffe8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:54:12 +00:00
Bill Yi
734ddee1de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2531d5736b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I478b0aaa6d46e0e6d5231a0375293d2647272b9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:54:03 +00:00
Bill Yi
8acb814c0a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f21bb3ba0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I06369143cdc186b47a637fce5defbe5817bdcd69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:53:32 +00:00
Automerger Merge Worker
919797970e Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 208c74fa3c -s ours am: 25fabc93a5 -s ours" into udc-qpr-dev-plus-aosp 2023-07-14 20:44:48 +00:00
Bill Yi
94d5c18859 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 208c74fa3c -s ours am: 25fabc93a5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2d429258bb7c7aaaf9685639719290a6cd8e674f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:44:18 +00:00
Bill Yi
324f9dc0ee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours am: 1ff28d9c1a -s ours am: 0cc5a16f95 -s ours am: 797d51f7cb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8894595ba7cc713a983f8e3e302f85ae555adb43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:44:03 +00:00
Bill Yi
7c58a2edb3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours am: 1ff28d9c1a -s ours am: f74197dd3c -s ours am: c69e38797c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0606ba057c19cdd679dec79e18f451420cf40765
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:42:01 +00:00
Bill Yi
05aa8c0efd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours am: 1ff28d9c1a -s ours am: 0cc5a16f95 -s ours am: a5dc181d3c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic2cf0d94c5aeb1e76a002921295d7cf468b99155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:41:04 +00:00
Bill Yi
72295da2e5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 1e86da303c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic7140c802963ae5cb7f8382303c5d702200c20ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:32:40 +00:00
Bill Yi
c4fdbfe95d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 1e86da303c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib6173731bcded7705e58f7663acfdd5b3d6d6ce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:31:39 +00:00
Automerger Merge Worker
b273d4ce5e Merge changes from topic "am-6f9e4022de18455493ebda8b0cfe7548" into udc-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 80172630a4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2764a59fac -s ours
 2023-07-14 20:25:12 +00:00
Bill Yi
a4f2a82d44 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 80172630a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia34f8055827477f57475c867a8dad186d4b29d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:24:51 +00:00
Bill Yi
ef607acf40 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2764a59fac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibd1cbf66e2b67a449ab5cd6c967bb90a4d27fb35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:24:32 +00:00
Bill Yi
4249011ef2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 80172630a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If23cd1ab963a5d74cab71d68cca7651a4c23e90d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:23:00 +00:00
Bill Yi
25fabc93a5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 208c74fa3c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I787ce23bfb1ed4a90590dbbc2c49d898dea16080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:22:49 +00:00
Bill Yi
73b25e2b61 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours am: 48a4220539 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8de4f771a15a31edd7a8c071b39a622eaf0b5bbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 20:22:44 +00:00