PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,080 Commits 1 Branch 0 Tags
b4ba4aab8fa999c12e20c304431777b79cda778e
Commit Graph

104080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weng Su
4026f4134f Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1 am: a30d123e12 am: 7abffe0057 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180

Change-Id: I17625880bf59eb632cc0dcdbc222c60a516d119e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 06:40:51 +00:00
Jason Hsu
a0524e53ad Merge "Set title to the hearing aid pair instruction dialog" into tm-dev am: abd4fd54b1 am: 3f88b72bea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17291806

Change-Id: I0942b354fc69207764ef671001907340335f1477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 06:34:32 +00:00
hoffc
6771edae5c Settings: Fix sometimes reset progress dialog not dismissed 
The display of reset progress dialog takes time. User can initiate multiple clicks and show multiple progress dialogs during the internal. But in fact, only once dismiss request initiated.

Check the reset progress dialog, if it is showing, dismiss it firstly before show another reset progress dialog.

Change-Id: Ia944990ea489927b38be59b1f7a8ad66fc8b669a
Buganizer: 227413950
 2022-03-30 14:28:17 +08:00
Weng Su
7abffe0057 Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1 am: a30d123e12 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180

Change-Id: If2619c93286363f268bb7021af1037195fcba4be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 06:26:59 +00:00
Weng Su
a2e5b7b7cb [automerger skipped] Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1 am: 95ff0f1453 -s ours 
am skip reason: Merged-In Ic434f0583cba557228c72508a501347ffa3141e1 with SHA-1 876f691377 is already in history

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

Change-Id: Ic37d4df464b13fdc23737b1fec9ec9894718a693
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 06:26:53 +00:00
Jason Hsu
3f88b72bea Merge "Set title to the hearing aid pair instruction dialog" into tm-dev am: abd4fd54b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17291806

Change-Id: I5b2ee4e522c86d0494ef3587b9c551d790fd1098
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 06:19:31 +00:00
Jason Hsu
33a5139d0e Merge "Set title to the hearing aid pair instruction dialog" into tm-dev am: abd4fd54b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17291806

Change-Id: I5cfa8a58fb3a3f204b3978b473fe993091e9826a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 06:17:46 +00:00
Weng Su
a30d123e12 Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180

Change-Id: I4d1bf49f4eab2ce72148cd308b5c217d814ab75c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 06:11:32 +00:00
Weng Su
95ff0f1453 Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180

Change-Id: I28a8e979130dc61c3cfdbe5b90bfc8ad905d1d35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 06:10:23 +00:00
Jason Hsu
abd4fd54b1 Merge "Set title to the hearing aid pair instruction dialog" into tm-dev 2022-03-30 06:03:00 +00:00
Jason Chiu
680fce3acd Refine layouts for large screen 
- Support dynamic paddings depending on app's screen width
- Add round corners to homepage ripple effect to improve the transition
  of being highlighted
- Add an interface to support dynamic split layout for suggestion cards

Bug: 223300824
Test: robotest, manual
Change-Id: Iaca6b4fd3f7369179416ef084a800d7eb2ee4640
 2022-03-30 04:54:30 +00:00
Kevin Han
23a0d79e4c Merge "Update hibernation toggle title to have "if unused"" into tm-dev am: c4c923d1eb am: 1f21417702 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17450694

Change-Id: I6743175adf787a662466781bb6b87186aff1a5de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 20:13:39 +00:00
Kevin Han
1f21417702 Merge "Update hibernation toggle title to have "if unused"" into tm-dev am: c4c923d1eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17450694

Change-Id: Ic478dc38f408b02762afbac4539d9b7e5ee61e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 19:30:03 +00:00
Kevin Han
1ffe33ed78 Merge "Update hibernation toggle title to have "if unused"" into tm-dev am: c4c923d1eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17450694

Change-Id: I81709e0acbdc0a9cf75d2dc7020b87e6df6f91f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 19:18:25 +00:00
Kevin Han
959e5796b3 [automerge] Update hibernation toggle title to have "if unused" 2p: 3cfc87cc05 am: 03a87f460b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17450694

Change-Id: Iae410252fc9f1fb809bbbaf1d0b516fffbff1439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 19:17:51 +00:00
Kevin Han
c4c923d1eb Merge "Update hibernation toggle title to have "if unused"" into tm-dev 2022-03-29 18:55:35 +00:00
TreeHugger Robot
d60e7161fd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1f881c6e86 -s ours am: 8c6668cd03 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I95b6265ed61b739aca160e0ebf166ac9a7e2e9a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 18:54:43 +00:00
Bill Yi
a17944a0e6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac9baaee08 -s ours am: 346d3a8459 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44e5cbfd6ad67066b01518d19e1c3d296c1a138b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 18:54:39 +00:00
Kevin Han
03a87f460b [automerge] Update hibernation toggle title to have "if unused" 2p: 3cfc87cc05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17450694

Bug: 227235454
Change-Id: I61350d752c0324b3672193dcbbf364f4696ec786
 2022-03-29 18:38:18 +00:00
TreeHugger Robot
7e82f77aed [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1f881c6e86 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I08938b246f731d42fbe481a554eb275e7b38e13f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 18:18:08 +00:00
TreeHugger Robot
8c6668cd03 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1f881c6e86 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e50a31578e4289e72d932fc9df3edb4e8297150
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 18:17:31 +00:00
Bill Yi
346d3a8459 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac9baaee08 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I27cc7eb93246429765820f51c926f12a72a4adfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 18:17:30 +00:00
TreeHugger Robot
7a387514d8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 3c7d6ac0e5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia42e9687c386dd2828fce0b4b2904508ff9adf11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 18:10:43 +00:00
Bill Yi
8973feec74 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b387657974 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e146b75a399d0523b4df567931d98a391d94270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 18:10:23 +00:00
TreeHugger Robot
1f881c6e86 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-29 17:54:31 +00:00
TreeHugger Robot
3c7d6ac0e5 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-03-29 17:51:45 +00:00
Aaron Liu
c138118d48 Home Controls: Add conditional copy for setting. 
Add conditional copy for when allow trivial devices setting is disabled.
Add guidance on how to enable it.

Bug: 227344249
Test: Manual and unit test
Change-Id: I0f2f6dc933804ee6ba15dc180dc717d2a5b729a5
 2022-03-29 17:27:17 +00:00
Treehugger Robot
bde7565383 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d35c876857 -s ours am: 178ba3e57d -s ours am: 0818a1c62b -s ours am: 997bdcf8f8 -s ours am: 8c98f0296d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I74b3a8329128eb11d1f9cd5d25ab2d325379c627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:33:28 +00:00
Bill Yi
6fd530eb0a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38de1eab21 -s ours am: 5f55cb2ed8 -s ours am: 2b1435d300 -s ours am: cbb3ac7c9e -s ours am: 98fd319aba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I43f5e70e1d06264ed41f0e8ffa0c10a156dffc54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:33:27 +00:00
Treehugger Robot
d3affe74a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 65c7ff0276 -s ours am: 3ad321509f -s ours am: c5142845f8 -s ours am: cb0150bde0 -s ours am: 243e18d857 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iefd195d5e55a2f8bb83630afd6300e8ce59a83c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:33:17 +00:00
Bill Yi
e3e2f8c9ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62dc714628 -s ours am: b28c27e68e -s ours am: e68d843167 -s ours am: 5729190b77 -s ours am: 0166aae999 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4fefc2cb47f66f74e28bad2d353f01c9a4d191f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:33:15 +00:00
TreeHugger Robot
6b18320374 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 97539de67e -s ours am: 0e536d93b5 -s ours am: 2e4f458627 -s ours am: d8ef930b69 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I29f1a7f56cb05523991adea25b971ce37eaaa801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:33:05 +00:00
Bill Yi
4fee4d4fa0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b50ee2d6 -s ours am: cc3a93e23b -s ours am: f0886d920c -s ours am: f3b2661db4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iace7ee34ba76d0d0e908ac5156e56259efe3375d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:33:04 +00:00
TreeHugger Robot
4a4db9bd09 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4d9878828e -s ours am: 2703c29227 -s ours am: e5091256f4 -s ours am: c28707b38e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I853ca375c9839f4990eb94abf2ffcaa2030ac88b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:32:49 +00:00
Bill Yi
bafdb0a4ed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e58dde841 -s ours am: 620782b9d4 -s ours am: 78bfe2c604 -s ours am: fd71e4b975 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie1bdc8cf7de940243f230177282ab66072da1228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:32:48 +00:00
Peter Wang
703f40727e [automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 0ab2226dff -s ours am: 4f5dbc4db4 -s ours am: 886b22a7a6 -s ours am: c7e49878b8 -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 6879183335 is already in history

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

Change-Id: Ifac871fba8dc2e9ddeb145ffff866bbcab61b55b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:32:30 +00:00
Treehugger Robot
a7f9aa8f72 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d35c876857 -s ours am: 178ba3e57d -s ours am: 0818a1c62b -s ours am: 997bdcf8f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44f0a73d229b51e4e096597ea193adfe5c2accd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:48 +00:00
Bill Yi
bd302a282f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38de1eab21 -s ours am: 5f55cb2ed8 -s ours am: 2b1435d300 -s ours am: cbb3ac7c9e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic98c2d093680839a55e4bb3e12ecfdfe8e3973ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:47 +00:00
Treehugger Robot
8c98f0296d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d35c876857 -s ours am: 178ba3e57d -s ours am: 0818a1c62b -s ours am: 997bdcf8f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I92eb6b101e2c4dbdf1c04579e0641cdd8380b91f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:38 +00:00
Bill Yi
98fd319aba [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38de1eab21 -s ours am: 5f55cb2ed8 -s ours am: 2b1435d300 -s ours am: cbb3ac7c9e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4720ac13081819a9c47c7c3e7e9eac1c7c626e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:37 +00:00
Treehugger Robot
c9ebd6bd00 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 65c7ff0276 -s ours am: 3ad321509f -s ours am: c5142845f8 -s ours am: cb0150bde0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic8a4d80c3bd4c0680fce773007f97cbc2bacfcaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:37 +00:00
Bill Yi
5162d576e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62dc714628 -s ours am: b28c27e68e -s ours am: e68d843167 -s ours am: 5729190b77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1b4183c85c31100bf0a0ab8549a3dcc15c28f692
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:35 +00:00
Treehugger Robot
243e18d857 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 65c7ff0276 -s ours am: 3ad321509f -s ours am: c5142845f8 -s ours am: cb0150bde0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I80cc502b305fe4ba1936fc2d8d0d459475f25752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:29 +00:00
Bill Yi
0166aae999 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62dc714628 -s ours am: b28c27e68e -s ours am: e68d843167 -s ours am: 5729190b77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9788d84a57eefdd8794e1af790cdc78821a40b7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:28 +00:00
TreeHugger Robot
e4f6e79445 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 97539de67e -s ours am: 0e536d93b5 -s ours am: 2e4f458627 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic228723d03a5d5622e293b1e848a4e42cb583ee3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:26 +00:00
Bill Yi
ff3c2221f3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b50ee2d6 -s ours am: cc3a93e23b -s ours am: f0886d920c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If79331b9030dd952b75594159a28be751752f72e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:24 +00:00
TreeHugger Robot
d8ef930b69 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 97539de67e -s ours am: 0e536d93b5 -s ours am: 2e4f458627 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2bfabd4b816f1ea2891992e3aa08efc3a09b66fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:20 +00:00
Bill Yi
f3b2661db4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b50ee2d6 -s ours am: cc3a93e23b -s ours am: f0886d920c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I14c3dec853939107738e8e6cb8f1ff2687c04026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:19 +00:00
TreeHugger Robot
24f17a1006 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4d9878828e -s ours am: 2703c29227 -s ours am: e5091256f4 -s ours 
am skip reason: subject contains skip directive

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

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