PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,992 Commits 1 Branch 0 Tags
571f09d5a9be2448fbfe707c9dc66ed4e2e24f2c
Commit Graph

89992 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
270ce09842 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: d18efb1358 -s ours am: c95b61f5f3 -s ours am: 7f0820ba09 -s ours am: 90d2c5ded2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5bed915b927474bb065dd2fe6bc09cc1b2e13906
 2021-11-04 10:08:55 +00:00
Bill Yi
b5e306ce19 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: 4933470166 -s ours am: 8f132e48f6 -s ours am: 7493a1c8f1 -s ours am: 3bf6443c3b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a3fb538e393ace6b707234c69d15cb079027933
 2021-11-04 10:08:49 +00:00
Bill Yi
881e62e394 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 579555c158 -s ours am: 7a05400c26 -s ours am: d51e96b212 -s ours am: 73606b9c56 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I294595254738f98a3fa14dfad15eac1f1320e96c
 2021-11-04 10:08:42 +00:00
Bill Yi
5d72e96a66 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: d18efb1358 -s ours am: c95b61f5f3 -s ours am: 7f0820ba09 -s ours am: 0db68469ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id4632a2959dc03a8ca5c49377f048e4b17241882
 2021-11-04 10:08:35 +00:00
Automerger Merge Worker
927b097a41 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 6510b1715b -s ours am: 4a273e4c6b -s ours am: 38c9bb9362 -s ours am: f7939d35f5 -s ours" into sc-v2-dev-plus-aosp 2021-11-04 10:08:31 +00:00
Bill Yi
236065badf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 6510b1715b -s ours am: 4a273e4c6b -s ours am: 38c9bb9362 -s ours am: 899f7414bf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8bbfedad9d1311e409d57c00cbaa6572e90e3b1e
 2021-11-04 10:08:28 +00:00
Bill Yi
d0723669a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 6510b1715b -s ours am: 4a273e4c6b -s ours am: 38c9bb9362 -s ours am: f7939d35f5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99766bfbe4e6591ab5ce0dbff5e2ea3638b4b8ed
 2021-11-04 10:08:26 +00:00
Bill Yi
740477dc52 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: 4933470166 -s ours am: 8f132e48f6 -s ours am: ba11c08f71 -s ours am: b91416b6fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2fd187e36a1b672b9dc234c94b24d0a6f90ed60c
 2021-11-04 10:08:22 +00:00
Bill Yi
28029299e1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 579555c158 -s ours am: 7a05400c26 -s ours am: b2daff0ad3 -s ours am: bbc8fcad51 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41a08651f1fe19ea556270e9385fecf577d34131
 2021-11-04 10:08:14 +00:00
Bill Yi
cd5b3be99c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: d18efb1358 -s ours am: c95b61f5f3 -s ours am: a7e7987804 -s ours am: d858a497fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I46719d2f90003ee63828bfb8d4f87ea4dc22ccac
 2021-11-04 10:08:07 +00:00
Bill Yi
fcad28e786 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 6510b1715b -s ours am: 4a273e4c6b -s ours am: 25be092f3b -s ours am: 59793f8785 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I456b72876ac3c01310c45cad9ec667605c233f33
 2021-11-04 10:07:52 +00:00
Arc Wang
e80b74de3a [Large screen] Check if it's in 2-pane before 2-pane deep link flow 
The callback of SplitStateObserver.SplitStateListener can have one
or more active splits when there is already 2-pane in Activity stack.

This change prevent unnecessary 2-pane deep link flow if the Activity
is already in 2-pane activity stack.

This solution does not work if the Activity was started in a new task.
(e.g., Intent.FLAG_ACTIVITY_NEW_TASK, launchMode singleTask).

Bug: 201379454
Bug: 201620626
Bug: 204398432
Bug: 204397936
Bug: 197609195
Bug: 197609197
Bug: 204501179
Bug: 204959335
Bug: 204845334
Test: manual
      1. Settings -> Apps > Default apps > Opening links.
      2. Click back button should back to Default apps page.
Change-Id: I04aaceed47a8f2754a4e17c53b49252f61e0a1d1
 2021-11-04 17:20:17 +08:00
TreeHugger Robot
c425a4ae93 Merge "Update "Mobile network standby" attribute label into "Mobile network"" into sc-v2-dev 2021-11-04 09:11:04 +00:00
Bill Yi
3bf6443c3b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: 4933470166 -s ours am: 8f132e48f6 -s ours am: 7493a1c8f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibc0d39e1a70c151ca911be921742b7e6498c397d
 2021-11-04 07:56:09 +00:00
Bill Yi
73606b9c56 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 579555c158 -s ours am: 7a05400c26 -s ours am: d51e96b212 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9428f1fdc0e62a1201fcb12eaa0a87f1756661d5
 2021-11-04 07:56:02 +00:00
Bill Yi
9d554450b0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: 4933470166 -s ours am: 8f132e48f6 -s ours am: 7493a1c8f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I071ad78e8a2f6bb415ec5af61f10bfe6fc5508b9
 2021-11-04 07:55:58 +00:00
Bill Yi
0db68469ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: d18efb1358 -s ours am: c95b61f5f3 -s ours am: 7f0820ba09 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d8288aba079744d82408a91eb0ea7ee07be250b
 2021-11-04 07:55:56 +00:00
Bill Yi
84b11eefca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 579555c158 -s ours am: 7a05400c26 -s ours am: d51e96b212 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0acefa0287b4ef07bf8ab307c9f1c970e8b5e123
 2021-11-04 07:55:54 +00:00
Bill Yi
90d2c5ded2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: d18efb1358 -s ours am: c95b61f5f3 -s ours am: 7f0820ba09 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c5b92d64fa2b247d7b32fe9ef04bd088728ee8a
 2021-11-04 07:55:51 +00:00
Bill Yi
899f7414bf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 6510b1715b -s ours am: 4a273e4c6b -s ours am: 38c9bb9362 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icbc57a543a9a5ec2f5c79f2ab37d725da0967463
 2021-11-04 07:55:49 +00:00
Bill Yi
f7939d35f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 6510b1715b -s ours am: 4a273e4c6b -s ours am: 38c9bb9362 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2a25941728663b0393cb8c8f95305c45cc3c2f5c
 2021-11-04 07:55:47 +00:00
Bill Yi
b91416b6fd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: 4933470166 -s ours am: 8f132e48f6 -s ours am: ba11c08f71 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I507b80419dbc3fd42ff159560a3dd82deddc43c9
 2021-11-04 07:55:29 +00:00
Bill Yi
bbc8fcad51 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 579555c158 -s ours am: 7a05400c26 -s ours am: b2daff0ad3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I28a4a9323ab9e9d96bdfc43d4d7d64e946b60a2b
 2021-11-04 07:55:23 +00:00
ykhung
22dc875ba7 Update "Mobile network standby" attribute label into "Mobile network" 
Bug: 205051643
Test: make SettingsRoboTests
Change-Id: Ia8f5c3e76d72ffa6fd0601c58b1b3d157b711b30
 2021-11-04 15:55:23 +08:00
Bill Yi
d858a497fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: d18efb1358 -s ours am: c95b61f5f3 -s ours am: a7e7987804 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If873f78b687d2ecc28b6de5ce117c4c7a54a50e4
 2021-11-04 07:55:18 +00:00
Bill Yi
59793f8785 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 6510b1715b -s ours am: 4a273e4c6b -s ours am: 25be092f3b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f9ed58dcc110d6017203f1fb5b539001d8ac8f4
 2021-11-04 07:55:05 +00:00
Bill Yi
7493a1c8f1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: 4933470166 -s ours am: 8f132e48f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc52815ca55d4e7409f926b8e94bd411e58a8a87
 2021-11-04 07:38:52 +00:00
Bill Yi
d51e96b212 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 579555c158 -s ours am: 7a05400c26 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If762afbc0779ce9677359df76f27d6497dff0046
 2021-11-04 07:38:47 +00:00
Bill Yi
7f0820ba09 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: d18efb1358 -s ours am: c95b61f5f3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d1aad6e0003033cf74c3f4d9b351159d523ce82
 2021-11-04 07:38:43 +00:00
Bill Yi
38c9bb9362 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 6510b1715b -s ours am: 4a273e4c6b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0e61626cb5e20f4f5f8bd2120bd603c62fd8d17
 2021-11-04 07:38:39 +00:00
Bill Yi
ba11c08f71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: 4933470166 -s ours am: 8f132e48f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I254e6c5f36f5da439af64a1bd67e818e51064fdd
 2021-11-04 07:36:00 +00:00
Bill Yi
b2daff0ad3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 579555c158 -s ours am: 7a05400c26 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibaef6558f196029d8c4c80f766def947aa0c1f80
 2021-11-04 07:35:55 +00:00
Bill Yi
a7e7987804 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: d18efb1358 -s ours am: c95b61f5f3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I79e1a7c96c81045d93da42d340cf0028bb482192
 2021-11-04 07:35:50 +00:00
Bill Yi
25be092f3b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 6510b1715b -s ours am: 4a273e4c6b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9a0ce49aaa7549b94dfb8ec907f0fbf2cc1f122a
 2021-11-04 07:35:43 +00:00
Bill Yi
8f132e48f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: 4933470166 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I484e3772e80fd51e23571edbb698ffc60f5a6360
 2021-11-04 07:21:03 +00:00
Bill Yi
7a05400c26 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 579555c158 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0cdc73ba03b7c30972d505a304befa42ed355979
 2021-11-04 07:20:32 +00:00
Bill Yi
c95b61f5f3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: d18efb1358 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibfebb68698f76245cbc6531c8ef1552892d833c6
 2021-11-04 07:19:21 +00:00
Bill Yi
4a273e4c6b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 6510b1715b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1564a6240e9ef842400c21b3e46d306c674763ba
 2021-11-04 07:19:15 +00:00
Bill Yi
4933470166 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I78a3b5ac05e11b0ebeb7ccacd27710edf93ef207
 2021-11-04 07:01:40 +00:00
Bill Yi
579555c158 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib6f5af976b9a1562b4e0b9946a919d593c45e346
 2021-11-04 07:01:37 +00:00
Bill Yi
d18efb1358 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I490f2611d4174b0db4ece4bc9cd12e18bdfc9490
 2021-11-04 07:01:36 +00:00
Bill Yi
6510b1715b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1f8d952588c3a51cd3f9bdf3b81d617f8fd28def
 2021-11-04 07:01:32 +00:00
Bill Yi
c890436e44 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb42730091 -s ours am: d0a337b13b -s ours am: f7cd8107cb -s ours am: 8415e02593 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6c40237c79552fad1a472410d9ba27c3d6471270
 2021-11-04 06:49:16 +00:00
Bill Yi
e66fc6815d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b62b6088 -s ours am: 88501c1c56 -s ours am: 8372f4cb1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I91deba8895a63ae7ef695ec02a5f33bb87cf9d1f
 2021-11-04 06:49:11 +00:00
Bill Yi
8415e02593 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb42730091 -s ours am: d0a337b13b -s ours am: f7cd8107cb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d8c47b4f7be876009ea53c9f1915eb9f9af3fa1
 2021-11-04 06:44:08 +00:00
Bill Yi
3dce4a08dd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb42730091 -s ours am: d0a337b13b -s ours am: f2cec9f3fd -s ours am: 946a8a905d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I02e276bd245ec7f5fc2a6e6aafd8a73d0f9bf107
 2021-11-04 06:44:04 +00:00
Bill Yi
b78ee724ae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I645d9a20f4e0ea7507d37ee532084fbdac7dd4da
 2021-11-04 06:44:01 +00:00
Bill Yi
8b1cf9dc11 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b62b6088 -s ours am: 16166fe2f6 -s ours am: bbbd9ac7e0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I43605920adf50bfce3c2147138f963f6e81cd9f7
 2021-11-04 06:44:01 +00:00
Bill Yi
e99626cbca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic8251b60cd836a7ffeeb01f3019052bc99df8857
 2021-11-04 06:43:58 +00:00
Automerger Merge Worker
f9e287a846 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ffc0ed7b89 -s ours am: 6fa9eec8e2 -s ours" into sc-v2-dev-plus-aosp 2021-11-04 06:43:56 +00:00