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

123537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Biggers
a273ae9983 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 am: 257bc2eda1 -s ours am: 94573f96bb -s ours am: 488ca4b012 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I069ae0c10e178ce0dd9fa0ac2f5d6deac21eafb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 03:23:57 +00:00
Eric Biggers
c7b0174776 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 06c2588645 -s ours am: f20abd9355 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2053436f69f1aba547183417c24a38264a566072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 03:03:15 +00:00
Eric Biggers
27d521036b [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours am: 81bd8912af -s ours am: bf33df4d79 -s ours am: 92470de980 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86f873900afefe85d313d1db72e40a8eeb5a57aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 03:02:54 +00:00
Eric Biggers
488ca4b012 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 am: 257bc2eda1 -s ours am: 94573f96bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iba944040f4823180719a962d2157426354f070eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 03:02:33 +00:00
Eric Biggers
7946f730fd [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 am: 011f39e944 -s ours am: f509f69b79 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9f9929768247edfa08b73081e1c25633fa66268b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 03:01:45 +00:00
Eric Biggers
f20abd9355 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours am: 06c2588645 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3be3a5c8c1634a8c9c3cd2f3fb3d119dec9c1ae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 02:27:02 +00:00
Eric Biggers
92470de980 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours am: 81bd8912af -s ours am: bf33df4d79 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I20fae5de7473a5b2ba5f5282665edeace6c8a6c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 02:25:51 +00:00
Eric Biggers
f509f69b79 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 am: 011f39e944 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If649c72c39881c59dbd1a7597447d7430edb8961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 02:23:10 +00:00
Eric Biggers
94573f96bb [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 am: 257bc2eda1 -s ours 
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 423c0e0d47 is already in history

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

Change-Id: I54f02689dc9ac8b5c9fed1a21cb692aa4fe6a89a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 02:16:45 +00:00
Eric Biggers
c86183ec60 [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev am: 94ffd66957 -s ours am: 7bed9704c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6fb8b7198d1f4199b64cb0540091208847704aad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 01:55:35 +00:00
Eric Biggers
2f8d8d1d79 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47 -s ours am: 8360c2e940 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If8220391370f5485505e0990ed9d71b513a21c78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 01:55:29 +00:00
Eric Biggers
06c2588645 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5b558e9a8b46f465fa87be7d5232239bb7eec3b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 01:38:41 +00:00
Eric Biggers
bf33df4d79 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours am: 81bd8912af -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I05baeebef5abb0d46da580535914772270bb6325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 01:37:27 +00:00
Eric Biggers
257bc2eda1 RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301337

Change-Id: I701bf72cefdaaeb465123aa1aedb581ab6408157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 01:35:24 +00:00
Eric Biggers
011f39e944 RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301337

Change-Id: I8607f271c5daf117b25502b572598e48dc2de30f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 01:35:06 +00:00
Eric Biggers
7bed9704c9 [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev am: 94ffd66957 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f6f74c706a397cfbad6685c152c015906a63b74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 01:31:46 +00:00
Eric Biggers
8360c2e940 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41c8afe636e06554df78cc253b93e6dfea887f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 01:31:36 +00:00
Eric Biggers
2ce24a1fa9 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35f68ccc8b118df5340a679e9a8c128055486ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 01:15:38 +00:00
Eric Biggers
81bd8912af [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icfbce08c030aac4ac4532bf4535970c2a97f22f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 01:14:44 +00:00
Eric Biggers
7475b96786 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I72421fe89e4b0ed32f193384805bc502e0f24f9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 01:11:34 +00:00
Eric Biggers
94ffd66957 Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev 2023-08-08 00:51:38 +00:00
Bill Yi
0e59758074 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb0b6e5f6b38a23bece7bad0a115c3e4eb5e423c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 07:55:45 +00:00
Bill Yi
45eb3572ff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2bf6035ffd109a82ecc2cb743b57bf020cdb3053
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 07:11:15 +00:00
Bill Yi
b8f4dd6e0f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours am: f3ddb4a624 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id9b01d4dd30afbe01e3777c89da2a3db86943ce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 19:54:35 +00:00
Bill Yi
f3ddb4a624 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If487bb3281585de22121dd4240bb566be4584ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 19:15:48 +00:00
Bill Yi
d56eb42615 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I88df717cf88e78ce5cbe17b53f50dbccf03aecf2
 2023-08-03 20:29:24 -07:00
Bill Yi
74fd980e5f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9dc5389350ec7cb3c1988eb69fc5c23c5c50707d
 2023-08-03 20:27:38 -07:00
Bill Yi
d447dcfcea Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I36696445b89cb0d0dd94aa210d559a6c60a79d82
 2023-08-03 20:21:12 -07:00
Bill Yi
c9c69ea360 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia533f5f510595ee2d748364f1e30e8b8a9a4a911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 19:43:11 +00:00
Bill Yi
c52abcd3fa Import translations. DO NOT MERGE ANYWHERE 
BUG:291684185

Auto-generated-cl: translation import
Change-Id: Ia444bb69cc499bd8d4a5ffc8c72babdda213c385
 2023-08-03 11:04:31 -07:00
Eric Biggers
99be30f895 RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() 
When LockPatternUtils#setLockCredential() fails, it can either return
false or throw an exception.  Catch the exception and treat it the same
way as a false return value, to prevent crashing com.android.settings.

Bug: 253043065
Test: Tried setting lockscreen credential while in secure FRP mode using
      smartlock setup activity launched by intent via adb.  Verified
      that com.android.settings no longer crashes due to the exception
      from LockPatternUtils#setLockCredential().
Change-Id: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
(cherry picked from commit 05f1eff1c9)
(moved change into ChooseLockPassword.java and ChooseLockPattern.java,
 which are merged into SaveAndFinishWorker.java on udc-qpr-dev and main)
Merged-In: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
 2023-08-02 23:43:41 +00:00
Eric Biggers
6e92ca106e RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() 
When LockPatternUtils#setLockCredential() fails, it can either return
false or throw an exception.  Catch the exception and treat it the same
way as a false return value, to prevent crashing com.android.settings.

Bug: 253043065
Test: Tried setting lockscreen credential while in secure FRP mode using
      smartlock setup activity launched by intent via adb.  Verified
      that com.android.settings no longer crashes due to the exception
      from LockPatternUtils#setLockCredential().
Change-Id: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
(cherry picked from commit 05f1eff1c9)
(moved change into ChooseLockPassword.java and ChooseLockPattern.java,
 which are merged into SaveAndFinishWorker.java on udc-qpr-dev and main)
Merged-In: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
 2023-08-02 23:43:23 +00:00
Eric Biggers
e0b5a793a1 RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() 
When LockPatternUtils#setLockCredential() fails, it can either return
false or throw an exception.  Catch the exception and treat it the same
way as a false return value, to prevent crashing com.android.settings.

Bug: 253043065
Test: Tried setting lockscreen credential while in secure FRP mode using
      smartlock setup activity launched by intent via adb.  Verified
      that com.android.settings no longer crashes due to the exception
      from LockPatternUtils#setLockCredential().
Change-Id: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
(cherry picked from commit 05f1eff1c9)
(moved change into ChooseLockPassword.java and ChooseLockPattern.java,
 which are merged into SaveAndFinishWorker.java on udc-qpr-dev and main)
Merged-In: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
 2023-08-02 23:43:10 +00:00
Eric Biggers
423c0e0d47 RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() 
When LockPatternUtils#setLockCredential() fails, it can either return
false or throw an exception.  Catch the exception and treat it the same
way as a false return value, to prevent crashing com.android.settings.

Bug: 253043065
Test: Tried setting lockscreen credential while in secure FRP mode using
      smartlock setup activity launched by intent via adb.  Verified
      that com.android.settings no longer crashes due to the exception
      from LockPatternUtils#setLockCredential().
Change-Id: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
(cherry picked from commit 05f1eff1c9)
(moved change into ChooseLockPassword.java and ChooseLockPattern.java,
 which are merged into SaveAndFinishWorker.java on udc-qpr-dev and main)
Merged-In: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
 2023-08-02 23:42:52 +00:00
Bill Yi
6a05d24aeb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0203970ca5ae0cd875997a601a8f66cf96de39f1
 2023-08-02 14:57:40 -07:00
Austin Delgado
c6e7b93f28 Merge "Announce requirements when setting PIN/Pass" into udc-d1-dev 2023-08-01 22:13:34 +00:00
Austin Delgado
035b661ea4 Announce requirements when setting PIN/Pass 
Test: Manual, verify requirement is read
Fixes: 281955512
Change-Id: I6d963d545c68c4ec891d9ad8a7da8c0a0f6e9d6b
 2023-07-31 17:50:39 -07:00
Bill Yi
c1363443ee Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I63fcff4de0780220331244eaeb16840cfeef600e
 2023-07-31 16:13:38 -07:00
Treehugger Robot
4a3b7b8492 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 41d64c9bef -s ours am: 8d6051a0c5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I14cf004b99d8d598f58263e79ef4f66cf30263c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:43:59 +00:00
Bill Yi
f07ff4759e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bba3d174b -s ours am: 869a35f0cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I71bb876f64f137417b4a08bdd154a9fbf6784078
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:43:50 +00:00
Treehugger Robot
b750e93272 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: cbe877892f -s ours am: 90e7cfacc6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0cf5f275d1780afa1b896303542a25c0f9cf67e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:23:13 +00:00
Bill Yi
31ea0ae325 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebacced122 -s ours am: 07b8d85c47 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4bde85f590bd1ff2ac687b440dd3929dd47bee19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:23:10 +00:00
Treehugger Robot
8d6051a0c5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 41d64c9bef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7edd6c919617c6e2b03aae06b409a84d36d064f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:07:22 +00:00
Bill Yi
869a35f0cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bba3d174b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If67577e5d9f33fc84225bd53857e2e100c5f3221
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:07:12 +00:00
Treehugger Robot
90e7cfacc6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: cbe877892f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb7aed3a43239115c87473a745ca0d60723772e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:05:44 +00:00
Bill Yi
07b8d85c47 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebacced122 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id22c3fde7605bf488e141853e41586b1b3592720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:05:31 +00:00
Treehugger Robot
41d64c9bef Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-07-28 00:54:10 +00:00
Treehugger Robot
cbe877892f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-07-28 00:53:34 +00:00
Treehugger Robot
3f7e055c28 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bdb73ef28e -s ours am: 84c2322af1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6cc0b52a43f7b6f4d914abaeba0bc4f7f27ebf46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 22:34:16 +00:00
Bill Yi
159d0436eb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ff8c62f42 -s ours am: fe5316f848 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I053e81d5f31f665c41249f2ff79b5e9d442364ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 22:34:04 +00:00