PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,865 Commits 1 Branch 0 Tags
eafa2982006a9fab2b4abba72216e6dc60d5edfe
Commit Graph

109865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Mccloskey
eafa298200 Merge "Add phone, tablet, device fp deletion strings." into tm-qpr-dev am: 8ff0234717 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19929437

Change-Id: Ida9695d5f938e31f27888c7e1c90600b17fd0804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 23:46:06 +00:00
Joshua Mccloskey
8ff0234717 Merge "Add phone, tablet, device fp deletion strings." into tm-qpr-dev 2022-09-13 23:13:15 +00:00
Automerger Merge Worker
a75ff5a3fb Merge changes from topic "am-67940f1d9e3d4b94b33b6942a61a0c02" into tm-d1-dev-plus-aosp am: 808da23434 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19925036

Change-Id: If583d5d86e5fd65a3f0a8a8196c07d6f42bd6c8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 20:26:30 +00:00
TreeHugger Robot
84fdac6e03 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: dd445a736a -s ours am: 9dbda868e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I514e8480d1735ac3e449035f76f580b60901aac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 20:26:12 +00:00
Automerger Merge Worker
c570258cf0 Merge changes from topic "am-c8328431a47c4eebb006716640e11064" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: dd445a736a -s ours am: 025c77a1e7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: ffd1ed3a00 -s ours am: 751b145c67 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 5020aeaf5b -s ours am: 71ff19c956 -s ours
 2022-09-13 20:21:05 +00:00
TreeHugger Robot
e4f166a93b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: 73cfa8885a -s ours am: 338c608012 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6fab242aaf3eeafaaa122b72a466f4c044c3bb0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 20:18:29 +00:00
Bill Yi
ef92baaca9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: cd1753080f -s ours am: fd8f0fee80 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib99a187b3f747c5caa785e0b3600f22d639e2382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 20:18:15 +00:00
Bill Yi
c0d4a1358a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 92b538c0f0 -s ours am: 63fc658151 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f184e13907d499238356ab0448e2d3fa4847446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 20:18:03 +00:00
TreeHugger Robot
8c7f8c8de9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: dd445a736a -s ours am: 025c77a1e7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id58fcf70171d1ef37b47d72907dc9cb8745422c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 20:17:09 +00:00
Bill Yi
d68b27fed7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: ffd1ed3a00 -s ours am: 751b145c67 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I42ec578c2c20de4c955d5bb69e02ab6064683942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 20:17:01 +00:00
Bill Yi
bf5d13159f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 5020aeaf5b -s ours am: 71ff19c956 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3e390ae9167520d0d5c1dae5152fc99afda7c69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 20:16:42 +00:00
Automerger Merge Worker
808da23434 Merge changes from topic "am-67940f1d9e3d4b94b33b6942a61a0c02" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: dd445a736a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: ffd1ed3a00 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 5020aeaf5b -s ours
 2022-09-13 18:54:26 +00:00
TreeHugger Robot
338c608012 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: 73cfa8885a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I463ef303e41f838db56589f2e01d07168fe79cd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:51:51 +00:00
Bill Yi
fd8f0fee80 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: cd1753080f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7cb16d01b31890db0f2b5bc585120d9e52491b44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:51:37 +00:00
TreeHugger Robot
9dbda868e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: dd445a736a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I22d4e5beabb84f2f7eb204df23f62aee984fd82f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:51:32 +00:00
Bill Yi
63fc658151 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 92b538c0f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I204587378c45b54606f0faea021e442f0d5fffd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:51:25 +00:00
Bill Yi
7334ac9765 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: ffd1ed3a00 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54e65f48186d28ab71978cadb4d5aa6c9cb76ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:51:18 +00:00
Bill Yi
94b95cd07c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 5020aeaf5b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifb42aaa4bc5b011d9c5397096e341818c06989bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:51:06 +00:00
TreeHugger Robot
025c77a1e7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours am: dd445a736a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibe4b17fc3d476b322f38ec0dc27291568bb2a386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:50:49 +00:00
Bill Yi
751b145c67 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours am: ffd1ed3a00 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I66e82dbfe3e615faff30d30eca1a883e233ae660
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:50:34 +00:00
Bill Yi
71ff19c956 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours am: 5020aeaf5b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I003a3441594793b6ec60375d7fbe72d09cec5c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:50:24 +00:00
TreeHugger Robot
dd445a736a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7dcc61b6ab4486462819e00f32ad0257eab4bac8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:11:40 +00:00
Bill Yi
ffd1ed3a00 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I727cf5bfa8c148e0f589bd8c8e87aa8d59fd7c27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:11:26 +00:00
Bill Yi
5020aeaf5b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib510c3a81b652a330367a43560050f78531f34ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:11:14 +00:00
TreeHugger Robot
73cfa8885a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d04dc24d56 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4b0bb9c5644698a69ea1bac97dab0d14a99163fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:11:07 +00:00
Bill Yi
cd1753080f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4f092c748 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I28cc254ac98e63f6ca79b17a0e0938a5a8961ed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:10:55 +00:00
Bill Yi
92b538c0f0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3457e4080 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1146a9d8ceea29a070889cab45fe93aeb1189b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 18:10:40 +00:00
TreeHugger Robot
d04dc24d56 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-09-13 17:20:55 +00:00
YK Hung
63dd5861a9 Merge "Add fade in / out animation for battery usage hourly chart." into tm-qpr-dev am: 2a33c12028 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19897905

Change-Id: I78fd0896d72ab78b8a7ad676ae6c1beab3c260fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 17:10:17 +00:00
YK Hung
2a33c12028 Merge "Add fade in / out animation for battery usage hourly chart." into tm-qpr-dev 2022-09-13 16:44:17 +00:00
TreeHugger Robot
9386416103 Merge "Fix incorrect choose screen lock during unicorn" into tm-qpr-dev am: 094d7badba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880532

Change-Id: I7ef1ebee9bc4ba6e165f2dfab8fbef70fdc0d2c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 06:45:45 +00:00
TreeHugger Robot
094d7badba Merge "Fix incorrect choose screen lock during unicorn" into tm-qpr-dev 2022-09-13 06:23:40 +00:00
Kuan Wang
3759adfda6 Add fade in / out animation for battery usage hourly chart. 
After:
https://drive.google.com/file/d/1-1z2EM16X76qltTz_fL_DvgI7m65TtAN/view?usp=sharing

Before:
https://drive.google.com/file/d/1pG2rQ3V4rphjx7RLhSjb1r2HgXiFCYQZ/view?usp=sharing

Bug: 245655904
Test: manually
Change-Id: I72533a28445bea83aea604a937864052bd65c898
 2022-09-13 12:19:59 +08:00
TreeHugger Robot
41e6695253 Merge "Allow summary string support both mobile and tablet devices" into tm-qpr-dev am: 97985b6219 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19926604

Change-Id: Idcda95ee3ea366c6a827b09cdfc91d565dabf73d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 01:32:42 +00:00
SongFerngWang
b5dbbceecd Add more logs for analysis am: 4a5680ac09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19888371

Change-Id: I9a8d01347fec136bac16cb85ccbfb1e5860edda7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 01:31:59 +00:00
TreeHugger Robot
97985b6219 Merge "Allow summary string support both mobile and tablet devices" into tm-qpr-dev 2022-09-13 01:23:37 +00:00
SongFerngWang
4a5680ac09 Add more logs for analysis 
Bug: 245657079
Test: NA. It is the log only.
Change-Id: I9909acc27ccbef48f653cfcd0cc84942c4353eac
 2022-09-13 01:11:17 +00:00
TreeHugger Robot
9e155208bf Merge "Refine checkMaxEnrolled() for fingerprint" into tm-qpr-dev am: 311d818b10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880528

Change-Id: I7641e7dddb2865e402d02b7e6dac7c7437825f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-13 00:32:43 +00:00
TreeHugger Robot
311d818b10 Merge "Refine checkMaxEnrolled() for fingerprint" into tm-qpr-dev 2022-09-12 23:57:04 +00:00
Bill Yi
8a67244d48 [automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616 -s ours am: 3464e33135 -s ours am: 9c26bb64b8 -s ours am: 65b45b6ecb -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: I67c6da9fa91608e893c79cf8b9bc0b030efd630c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 21:16:12 +00:00
Bill Yi
e798f997d7 [automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4 -s ours am: 49efcf7816 -s ours am: 517f250e13 -s ours am: aab60c8d68 -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: I1ed3a6b4e538b22f8833a602a29cd0df08890c91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 21:15:56 +00:00
Joshua McCloskey
fccd144930 Add phone, tablet, device fp deletion strings. 
Test: Manual.
Fixes: 245411037
Change-Id: Ib1d83072878ede27758beb0381a12cab6172b9d6
 2022-09-12 21:00:58 +00:00
Bill Yi
65b45b6ecb [automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616 -s ours am: 3464e33135 -s ours am: 9c26bb64b8 -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: Ie01abae883d751824703018a75ef7a41de38cc8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 20:29:27 +00:00
Bill Yi
aab60c8d68 [automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4 -s ours am: 49efcf7816 -s ours am: 517f250e13 -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: I17f23d231f04f41092a3be5ce59a732faad85b53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 20:29:16 +00:00
Bill Yi
9c26bb64b8 [automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616 -s ours am: 3464e33135 -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: Id4b69cddf31a9a3d0bb781d7fecd0f21d369c0c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 19:57:13 +00:00
Bill Yi
517f250e13 [automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4 -s ours am: 49efcf7816 -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: I9474f8a455c20b5335f584ba8261fd5b29435995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 19:57:01 +00:00
Bill Yi
3464e33135 [automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616 -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: I20ddfee04e6de1e681b647a97296fcf29d97ce66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 18:56:26 +00:00
Bill Yi
49efcf7816 [automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4 -s ours 
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: I3e2c668af16aec333680c1ac7fad768b1db94c6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 18:56:14 +00:00
TreeHugger Robot
390769f44e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: e6fd2a5da8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib7897ec8a96aeac36b438b33c0895591f50e4274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 18:00:18 +00:00
Bill Yi
ad0109af91 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1bfdaf22a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia5941874f63385b0840dd9b6930344932eb7a34d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-12 18:00:03 +00:00