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

114403 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Automerger Merge Worker
448867320c Merge changes from topic "am-7d13f9b473c743eaae369a3946da2a24" into tm-qpr-dev-plus-aosp am: bc58cdf258 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19549241

Change-Id: I1000afbb1eb9b501ce347b717db4ec041fd190a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:38:07 +00:00
TreeHugger Robot
d3314d0add [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8089ee68b7 -s ours am: 21d61f272c -s ours am: 2384454b65 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I94bc7eec97c6483d8526f1926e44db72d66d9175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:37:49 +00:00
TreeHugger Robot
9f195e63f4 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-08-08 07:33:18 +00:00
TreeHugger Robot
3932736a5a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-08-08 07:33:18 +00:00
TreeHugger Robot
a57a7f0254 [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: 7f57f245ea -s ours am: e5e1052716 -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: I79fd75a7068c4cecb7b3919561f08546de0247bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:32:47 +00:00
TreeHugger Robot
41bef7c889 Merge changes from topic "tc_change_22080720_11" into tm-dev am: 4b5e98636d am: d326b911be am: 5410535cba am: 6189cc318d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967

Change-Id: Ie1fd7505af497eda62cac22b36dfbd515343df70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:26:35 +00:00
Bill Yi
b0bf84f358 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680 am: b53a13a2e0 -s ours am: 6233a4ce39 -s ours am: e4567ac6fa -s ours am: b10a2fd701 -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: I1d237b52a0efbd513f54354ce17f3c48b0c35f5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:26:32 +00:00
Bill Yi
285acd149d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564 am: 09659e52e5 -s ours am: c0cca64b22 -s ours am: 4c528042e6 -s ours am: 4848c77a19 -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: Ib979df53a5884f3996faafa76629c87656b5d386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:26:23 +00:00
TreeHugger Robot
76a9962c0f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8089ee68b7 -s ours am: ce769c9f5b -s ours am: e4df1dc20b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife18f6ddabee7cc3501f3ca54afd57b071410fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:22:50 +00:00
Bill Yi
437b05bdeb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7aee397d84 -s ours am: f7cfe7d1bb -s ours am: 2f1298d571 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I691aebd328681f30d0edc05e1d38312c69bf2726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:22:37 +00:00
Bill Yi
94be267e69 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c764b4ac4f -s ours am: e356dab2fb -s ours am: 4a8a7a520f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0e7de9a434b1c967adce3e47d3ab7a11e2452d66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:22:20 +00:00
TreeHugger Robot
d6f4942434 [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 skip reason: subject contains skip directive

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

Change-Id: Id99bec57eb57d1362c833aa7e24c61c9a6388073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:02:56 +00:00
Automerger Merge Worker
17eab9aea8 Merge changes from topic "am-6a89556b0f144a87abc7fcd05a7de322" into tm-qpr-dev-plus-aosp 
* changes:
  Merge changes from topic "tc_change_22080720_11" into tm-dev am: 4b5e98636d am: d326b911be am: 32a0070207
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680 am: b53a13a2e0 -s ours am: 6233a4ce39 -s ours am: 2b568cf318 -s ours
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564 am: 09659e52e5 -s ours am: c0cca64b22 -s ours am: a00df58fa5 -s ours
 2022-08-08 07:02:47 +00:00
TreeHugger Robot
61f5b7895c [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 skip reason: subject contains skip directive

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

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

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

Change-Id: I3c18f1e752779f460d69610d5f8e7356c36de76e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:01:40 +00:00
Bill Yi
188991efd4 [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 skip reason: subject contains skip directive

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

Change-Id: Ic2c9a1a5dbc556c0115db206f01fa2fe1b0d0326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:01:39 +00:00
Bill Yi
fac8d7a7d2 [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 skip reason: subject contains skip directive

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

Change-Id: I37209fa5b788fcdfe13a623f6fba90707f7c978d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:01:35 +00:00
Bill Yi
fd1c9f5bdb [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 skip reason: subject contains skip directive

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

Change-Id: I1e931f6b11f9d31adf6262034e638f866a42e225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:01:33 +00:00
Bill Yi
1e7bd0316c [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 skip reason: subject contains skip directive

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

Change-Id: I9e9a9325a84342e92f3ca62415a44612cc444bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:01:27 +00:00
Automerger Merge Worker
bc58cdf258 Merge changes from topic "am-7d13f9b473c743eaae369a3946da2a24" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8089ee68b7 -s ours am: 21d61f272c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7aee397d84 -s ours am: 3e11ee7541 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c764b4ac4f -s ours am: 8e9e3128b0 -s ours
 2022-08-08 07:00:27 +00:00
TreeHugger Robot
e5e1052716 [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: 7f57f245ea -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: I2f566dce54e8c56ba529cf2c9d70edf998bb0467
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 07:00:09 +00:00
TreeHugger Robot
be9b184f82 [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 skip reason: subject contains skip directive

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

Change-Id: Ifb2f311ad4cf83441b483e8680f97f49fdf74302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-08 06:59:28 +00:00