PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,577 Commits 1 Branch 0 Tags
38a0dbf56e1727e8a495f09c5db1fe76dd9af086
Commit Graph

125577 Commits

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

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

Change-Id: I13cf5ec73c081b0edfa01b2bcfd46b8b87dda63b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 00:38:12 +00:00
Eric Biggers
5f07aba150 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:44:37 +00:00
Eric Biggers
b30cf4e8cb 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:44:09 +00:00
Eric Biggers
50cb0a35c9 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:54 +00: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
Eric Biggers
8f3ca8daeb 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:41:41 +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
Justin McClain
6d5ae56ab7 Merge "Adding owners file." into main am: 3bf19b75fb am: 01dbc55db8 am: 63256b458d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2684514

Change-Id: I3d616f015890d6ec77efc2558aa780553424dcfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-02 20:30:49 +00:00
Justin McClain
63256b458d Merge "Adding owners file." into main am: 3bf19b75fb am: 01dbc55db8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2684514

Change-Id: I9ae167fda396f42065c30c680bdc66806a02f342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-02 19:22:29 +00:00
Justin McClain
01dbc55db8 Merge "Adding owners file." into main am: 3bf19b75fb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2684514

Change-Id: I2f3b523f8ac1988ba51a9cc77b5868ff8f9e0ec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-02 18:19:22 +00:00
Justin McClain
3bf19b75fb Merge "Adding owners file." into main 2023-08-02 17:10:52 +00:00
Austin Delgado
0abddc88bc Merge "Announce requirements when setting PIN/Pass" into udc-d1-dev am: c6e7b93f28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24270037

Change-Id: I706d8f22283ead587622a6d0fd4907a7b9e93f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-01 23:05:19 +00:00
Austin Delgado
c6e7b93f28 Merge "Announce requirements when setting PIN/Pass" into udc-d1-dev 2023-08-01 22:13:34 +00:00
Bill Yi
50d506b8b5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1363443ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd9e4654e4bf946678c125de4ee2163e3cd6b4df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-01 17:42:47 +00:00
Justin McClain
5f8aeeb9ef Adding owners file. 
Test: m
Change-Id: I0b32a9bc0e9be65b3d2ff0ac07d79baa05305205
 2023-08-01 13:44:22 +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
32d5ef74fd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 41d64c9bef -s ours am: 8d6051a0c5 -s ours am: 5931e209fb -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: I50a45f36cb1d03074aa96a374ef5835acec46360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 19:07:54 +00:00
Bill Yi
177be97b58 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bba3d174b -s ours am: 869a35f0cc -s ours am: 1133ecb114 -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: Idfc1dfe3bf0079aa6c6179167db40dea79e17f79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 19:07:46 +00:00
Treehugger Robot
868cfd4209 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 41d64c9bef -s ours am: 8d6051a0c5 -s ours am: 4a3b7b8492 -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: I06ad5f02d6359bb0e59260bfed13993d44422202
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 19:06:45 +00:00
Bill Yi
5038667845 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bba3d174b -s ours am: 869a35f0cc -s ours am: f07ff4759e -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: Iefa7673de52210c6bc55a0dda3deff8e6a65aa63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 19:06:37 +00:00
Treehugger Robot
8d74cd751d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: cbe877892f -s ours am: 90e7cfacc6 -s ours am: b750e93272 -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: I3c8a61d9e4f391943d562ab42ccf351336608caa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:50:20 +00:00
Bill Yi
b6e4f5347a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebacced122 -s ours am: 07b8d85c47 -s ours am: 31ea0ae325 -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: I72a3e7a64bce5ef5a50df4adea494e59b44d4c31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:50:08 +00:00
Treehugger Robot
b5d2ff6e1a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: cbe877892f -s ours am: 90e7cfacc6 -s ours am: f4fe175b59 -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: Iee097b41da9fafbe51519d009346c638a8f36ec7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:49:00 +00:00
Bill Yi
6f28fb73b6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebacced122 -s ours am: 07b8d85c47 -s ours am: ed9ae7fd73 -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: Ibc74eb507e260c86a88421ce4495c1333aa3350e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:48:55 +00:00
Treehugger Robot
5931e209fb [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: Ia819857ed5f39e3581a6a43d80282f0c29a7d3f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:45:46 +00:00
Bill Yi
1133ecb114 [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: I0a64ce3bce8c18572a24788f3f2f5fa27b34751c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:45:38 +00: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
f4fe175b59 [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: I7d8a5a3e25cc3c91338f85199343ebbf23c89163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:26:15 +00:00
Bill Yi
ed9ae7fd73 [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: I186a146426717dcbc2ab2ce0052b2adf27a7e6ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:26:08 +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
0563fa9109 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bdb73ef28e -s ours am: 84c2322af1 -s ours am: 67c8ca53aa -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: Ib76974c16dfc3ed66695c10b8f40b282bf175c63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 23:22:37 +00:00
Bill Yi
ca3a2026cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ff8c62f42 -s ours am: fe5316f848 -s ours am: c742ec92e2 -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: I4a8d5d35751378d10590c93b4631b0c9ab267c3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 23:22:29 +00:00
Treehugger Robot
49df734359 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bdb73ef28e -s ours am: 84c2322af1 -s ours am: 3f7e055c28 -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: I6c236fdcc87fd5d8337a6eec7e2293f22fbe33b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 23:22:01 +00:00
Bill Yi
aea12d4991 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ff8c62f42 -s ours am: fe5316f848 -s ours am: 159d0436eb -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: I53c38375506ede99503599bac44953a1b705bde5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 23:21:53 +00:00
Treehugger Robot
67c8ca53aa [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: I58cbd237fadb933c2d6d365c9dc986f5a73622a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 22:38:20 +00:00
Bill Yi
c742ec92e2 [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: I5dc9503de4bb4096e1fd2c3ac32a1d6b1c16e5e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 22:38:14 +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