PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,176 Commits 1 Branch 0 Tags
b9abc156c8ed934f07957f344db511a13ceb1a7e
Commit Graph

114176 Commits

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

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

Change-Id: I0bdafaa4f8cb1e56ff6b2ec2c7ef120c976a7cce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:43:25 +00:00
Bill Yi
fe6ade2ec2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40 -s ours am: 0cf4c34624 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I231dcc9587b3aafbbbff1e4291c2ba3f2dad27fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:43:18 +00:00
Bill Yi
c6584ab4bd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c -s ours am: 4f7ff2683a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1d0ce608a264fe5c15f4037b35f911df9ff6ead8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:43:11 +00:00
Bill Yi
e69f1ed9f1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec -s ours am: a3491642be -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1b19daa28c89175361d745d56cab8a4cd27571a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:43:08 +00:00
Bill Yi
c46f4b35fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c -s ours am: 4f7ff2683a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic6d63b2a784aad8e66dd7c3b1ebe58a54a840850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:43:06 +00:00
Bill Yi
52e411165f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40 -s ours am: aa646b64f5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6efff4b97c3cae37373541e20158fd3ef3eb5cb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:43:01 +00:00
Bill Yi
af74f8dfde [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc -s ours am: 6c210588fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I00769191143c30e2dbaba985611c4b3ac756c478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:42:58 +00:00
Bill Yi
de8d1f362e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec -s ours am: e1617e2547 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icda5c5c8012ea5a9fbf415b6abf8e6baa451a891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:42:57 +00:00
Bill Yi
7a6cfc59bc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40 -s ours am: 9a59cb4425 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb989bcce06b10b09a76b212948f037fb8afa702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:42:51 +00:00
Bill Yi
e0ac14698e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc -s ours am: 6c210588fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a421db32540c8a2f0d79b7a2f90faf4ca16c9b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:42:51 +00:00
Bill Yi
0ba32e52db [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c -s ours am: 52d877f6f7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib2a3cf44a242412a8c963d64be7c76b84505ea42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:42:47 +00:00
Bill Yi
4e8f9c0dbf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c -s ours am: 339f517c18 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I381f1b7456d2d3d11cbb053aa575b2743eb092de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:42:38 +00:00
Bill Yi
9329cc2c2e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc -s ours am: aba6baf22b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc52e914f2454438e8fcd7364647ecf0c2c7d9ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:42:35 +00:00
Bill Yi
05199e1e03 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc -s ours am: 065b5806ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieddefeba6dd716c2dc47d79680cdbd276ff8360b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:42:24 +00:00
Bill Yi
ba8de85603 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9f23ed66bce82323676cc2cad73d20cd5daad0e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:15:24 +00:00
Bill Yi
e1617e2547 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia4467cda3be0dfe8bef977226bd7d66a5ea94243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:15:20 +00:00
Bill Yi
0cf4c34624 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iabd37d4636947ec369892943d08bae76834ae5eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:15:19 +00:00
Bill Yi
a3491642be [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34848403ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1dd9b048f034497cce8670ca8239a21243020590
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:15:15 +00:00
Bill Yi
9a59cb4425 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec81971e91f16fd26e37a75ad38114235259f2c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:15:11 +00:00
Bill Yi
aa646b64f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f52497bd40 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3c53da65aca139dc47e2204589553da16360189e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:15:07 +00:00
Bill Yi
4f7ff2683a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7fac7bceb551704f9dcedc7b676dcdbfe9edbe0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:15:05 +00:00
Bill Yi
339f517c18 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7188390127c2904eae5f1e892b327ac8e81fc2a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:14:58 +00:00
Bill Yi
52d877f6f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 83da16166c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I236896268c7fea5cdc506165ad1ea0b294323360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:14:56 +00:00
Bill Yi
6c210588fc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6fe437ee8b46b9198b9507e3888ec6574aecf2fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:14:51 +00:00
Bill Yi
065b5806ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I836e1654a4b78e9f4a7ee6955fc4ddb686c2a689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:14:44 +00:00
Bill Yi
aba6baf22b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 272619ebfc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id55af5bfe5dbef6605fb6972ffaf10513e3b3bfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 14:14:38 +00:00
Bill Yi
23c53a9965 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-08-08 13:47:57 +00:00
Bill Yi
229923b8b9 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-08-08 13:47:57 +00:00
Bill Yi
34848403ec Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-08 13:45:51 +00:00
Bill Yi
83da16166c Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-08 13:45:51 +00:00
TreeHugger Robot
89e77f8cfd Merge "Add margin between battery daily and hourly charts" 2022-08-08 12:41:38 +00:00
Sunny Shao
8b17025d71 Fix slider bar is too close to bottom problem 
- Extend the bottom padding of the RecyclerView.

Fixes: 219849557
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.accessibility
Change-Id: I197e837ad3d199b58d1c0ba46a08b0fa04277512
 2022-08-08 20:25:44 +08:00
Zaiyue Xue
b9bf92f5ae Add margin between battery daily and hourly charts 
screenshot: https://drive.google.com/file/d/1vXL4XO9HezZ4fTJ5wh6Fi13oXf54yc9q/view?usp=sharing&resourcekey=0--k4_Qk4e9ELyENeAySlYFw

Bug: 236101166
Test: manual
Change-Id: Ib4f5705661d2799cc74f6a957ce715ebb93b28b8
 2022-08-08 17:44:39 +08:00
TreeHugger Robot
4bed6894f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9f195e63f4 -s ours am: 55389e0c75 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e1389fa90235bb4c034070e386ee8ec74d1d827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 08:20:01 +00:00
Bill Yi
30c6d3480e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9f5b4abadd -s ours am: 16abe6a4a8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1c802edb931c192a0190f2db6dcd45cb580768a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 08:19:50 +00:00
TreeHugger Robot
41047ba21c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3932736a5a -s ours am: bfa798850b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc3a3d37b16b8c900c01e6aec43ad38be7f1edf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 08:19:36 +00:00
Bill Yi
f514fd2cdf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c5eb7f3fa4 -s ours am: dda3a0abe8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6880e2466122bb547621e077554903c387c08cc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 08:19:26 +00:00
TreeHugger Robot
55389e0c75 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9f195e63f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I06e72ecd7fe8aaa40995ad65091b71d93cd8a295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:56:59 +00:00
Bill Yi
16abe6a4a8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9f5b4abadd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I69dd1160af14c939edddee7ea6b3f2d34e3ee289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:56:50 +00:00
TreeHugger Robot
bfa798850b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3932736a5a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icdd28ed896b92e0f5353903ff57ffb6ad4185c43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:56:36 +00:00
Bill Yi
dda3a0abe8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c5eb7f3fa4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If0f687c4ce9b6708657835b943a5f50160ca47c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:56:23 +00:00
TreeHugger Robot
f3b8a23aae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 074ee502db -s ours am: 8c14b68114 -s ours am: 1e280a87bd -s ours am: 66c584cc0f -s ours am: d6f4942434 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id4f6881aeeb59afd13626e70b696060cc9033179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:50:38 +00:00
Automerger Merge Worker
95fae8e5c3 Merge changes from topic "am-6a89556b0f144a87abc7fcd05a7de322" into tm-qpr-dev-plus-aosp am: 17eab9aea8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967

Change-Id: Ic605749057b0f4e3565d771a196e44a0ae14aeea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:50:29 +00:00
TreeHugger Robot
db2f6e0171 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 074ee502db -s ours am: 8c14b68114 -s ours am: fd3d6db75b -s ours am: be9b184f82 -s ours am: 61f5b7895c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I870ef21a0543530ba48d1199837596b3dc5c58fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:49:33 +00:00
TreeHugger Robot
5734f3eec3 Merge changes from topic "tc_change_22080720_11" into tm-dev am: 4b5e98636d am: d326b911be am: 32a0070207 am: b5cf6f6e43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967

Change-Id: Ib6769b52e9041fb3cb80c5949722b9fba5f5564e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:47:27 +00:00
Bill Yi
b9ad4d5605 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680 am: b53a13a2e0 -s ours am: 6233a4ce39 -s ours am: 2b568cf318 -s ours am: 188991efd4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3f0b011fea19748eec1e274a88b69ce2b65f150
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:47:18 +00:00
Bill Yi
89c6ba3e09 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564 am: 09659e52e5 -s ours am: c0cca64b22 -s ours am: a00df58fa5 -s ours am: fd1c9f5bdb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I61261047a9e6aed6cd9651827d24b55d710de9dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:47:11 +00:00
TreeHugger Robot
635ed1017f Merge changes from topic "tc_change_22080720_11" into tm-dev am: 4b5e98636d am: e582a12055 am: b9d7a3a3d8 am: 63960765b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967

Change-Id: I7aa7211550dd99a1fbe673953afacd6b5874a451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:41:29 +00:00
Bill Yi
6d88123c4f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680 am: b53a13a2e0 -s ours am: 2e2e5de0d0 -s ours am: 64c4613600 -s ours am: fac8d7a7d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ide8f872627a9b41e6aec91bab1e38c55b68db892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:41:24 +00:00
Bill Yi
0e91ac7d39 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564 am: 09659e52e5 -s ours am: cb32361f41 -s ours am: abfcfc66c5 -s ours am: 1e7bd0316c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2fb5996243dd6bee4cc29591f14b6bed566285d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:41:18 +00:00