PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,476 Commits 1 Branch 0 Tags
dd82ecbf936293e3e2eb5e90afc8ed716fdefd58
Commit Graph

111476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Parks
3b6fe0813b Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

Change-Id: I14d08a02a7b27ae4bf3e54c03f9c9d33c6104a8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 13:14:53 +00:00
Jason Parks
5c4943cc93 Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

Change-Id: Ia63d08e0ece9f00930d5acd1569bfcfe6a10e597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 13:13:51 +00:00
Jason Parks
a48c508afa Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

Change-Id: I7d5be03e04e9c500bfdaef61dfef5699288dbd98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 13:13:24 +00:00
Jason Parks
73276b3c91 Merge "Use API to check for the superivion component." into tm-dev 2022-06-15 12:54:00 +00:00
TreeHugger Robot
f6bce14063 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours am: d61b92219c -s ours am: cb303ebddb -s ours am: 8f33d7a795 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0972a9ef74fc8f63608239dcedeee496a13aba74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 07:33:32 +00:00
Bill Yi
26044f6c40 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours am: 46611a953c -s ours am: b96acd4fac -s ours am: 5a1720b53b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I67220d53e2c3be25605af58181c5cf5de6227206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 07:33:23 +00:00
Bruno Kremp
b16ac39ee1 Keep setting of "TurnOff hotspot automatically" when AP is changed 
When AP config is changed, setting of "TurnOff hotspot automatically"
will be reset to default. Hence keep the setting when AP config changed.
Keep setting of whether auto shut down is enabled when AP
config changed.

Co-authored-by: Fangxiao Cao <fangxiao.x.cao@sony.com>

Test: manual test
Bug: 235370570
Change-Id: Ibd3d59b6a86edaf1253a2c9b035576e60a7beb96
 2022-06-15 09:20:18 +02:00
TreeHugger Robot
8f33d7a795 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours am: d61b92219c -s ours am: cb303ebddb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ff8d0c73c4715f7807db64e8e8d75a7b9a3c41c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 07:06:35 +00:00
Bill Yi
5a1720b53b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours am: 46611a953c -s ours am: b96acd4fac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e8b446607dd7a54d049e1522eb01a41e0dd7ed4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 07:06:22 +00:00
TreeHugger Robot
a67ac16157 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 2133a3d676 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I660ce68b6623ab3ecb0860ca19c303fcafe247ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:49:39 +00:00
Bill Yi
5071fa94a8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8725c56c1b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb4e65c02e93bdf01fc82fc201599f02b0e8d92a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:49:22 +00:00
Automerger Merge Worker
b1ff599118 Merge changes from topic "am-dd8c69c10b344f3180f2fd03dd449db6" 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours am: 858f84503c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours am: 52c93abc11 -s ours
 2022-06-15 06:44:00 +00:00
TreeHugger Robot
cb303ebddb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours am: d61b92219c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08978da87652acc89b46407184d3953c56cb4116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:40:04 +00:00
Automerger Merge Worker
858049e6b9 Merge changes from topic "am-1da92e41bda443aeaea2b6534a421baf" into tm-qpr-dev-plus-aosp am: 3d7561c4ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18875880

Change-Id: I9627ab9caf8d425f091f452491aa5654bbb0db75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:39:54 +00:00
Bill Yi
b96acd4fac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours am: 46611a953c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I57af273bd94d9d2b70d352bcb9755b1d1bcc86f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:39:45 +00:00
TreeHugger Robot
01d2b599f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours am: 5e4e0ee275 -s ours am: a1a8b5e856 -s ours am: 26cca4b0f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0c34f01f5cb0f7eb184356b898542d72a264106b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:39:42 +00:00
TreeHugger Robot
416a7c11e6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours am: 858f84503c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic677797b4882469b5bf290cfbd9cf48d700849f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:39:21 +00:00
Bill Yi
5f2e26f59d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours am: 52c93abc11 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib33b58f38e01715e00ca8a0810738d97cf074fa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:39:06 +00:00
TreeHugger Robot
5e703b7e3c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours am: 5e4e0ee275 -s ours am: 529d67575d -s ours am: 2069ea61f5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I17446165c03746a842c91181641269a8beceb2bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:34:06 +00:00
Bill Yi
e3e9916e80 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours am: 588d339d4d -s ours am: 09a7a53b04 -s ours am: c621b3bec4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5021a06a5ee7db3e04d959bc9a60a4bebaa6aa22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:33:56 +00:00
TreeHugger Robot
2133a3d676 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-06-15 06:32:13 +00:00
Amy Hsu
f1d20ee988 Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095 am: 16d022942f am: d6167384c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014

Change-Id: I84982265c34ab0e3d7d981feb418160c16a28bce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:32:06 +00:00
Amy Hsu
280e8b686d Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095 am: 7e0b5c8c07 am: d68c5cd23b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014

Change-Id: I7194ed2a947aa0943813dc600fae44d5fca807d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:31:24 +00:00
Automerger Merge Worker
3d7561c4ab Merge changes from topic "am-1da92e41bda443aeaea2b6534a421baf" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours am: 5e4e0ee275 -s ours am: a1a8b5e856 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours am: 588d339d4d -s ours am: a7456fac34 -s ours
 2022-06-15 06:31:01 +00:00
TreeHugger Robot
26cca4b0f0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours am: 5e4e0ee275 -s ours am: a1a8b5e856 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I31a39c9e4f8bc895da93426237576075c9c2ac2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:29:46 +00:00
Bill Yi
d5086bc572 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours am: 588d339d4d -s ours am: a7456fac34 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I745e0fb34e426e8f61baee2335094d7e3392e0cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:29:37 +00:00
TreeHugger Robot
2069ea61f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours am: 5e4e0ee275 -s ours am: 529d67575d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7b2bdbf34eaf15c7777567d5f37caf234f1f04ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:28:55 +00:00
Bill Yi
c621b3bec4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours am: 588d339d4d -s ours am: 09a7a53b04 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie2421b372d94b2cdfa9f7b1588e82f8e21ab53dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:28:44 +00:00
Amy Hsu
d6167384c2 Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095 am: 16d022942f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014

Change-Id: I980075fcc6d48e61d4661a5d3922b11d98e69768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:28:23 +00:00
Amy Hsu
d68c5cd23b Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095 am: 7e0b5c8c07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014

Change-Id: Id864846262cc794add2694833e6618d770409dcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:21:36 +00:00
TreeHugger Robot
a1a8b5e856 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours am: 5e4e0ee275 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I64150ce37ea4f962599a36f3934939905c44f2cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:21:31 +00:00
TreeHugger Robot
529d67575d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours am: 5e4e0ee275 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If296374235c6a3bfd6c73d2aa17467bea2608aaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:21:25 +00:00
Bill Yi
a7456fac34 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours am: 588d339d4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic8d0011e7ee64d4511fa8998a3bd2181783ded91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:21:22 +00:00
Bill Yi
09a7a53b04 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours am: 588d339d4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6d6fe6513e6bf4091223d688f65348eddf70fdab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:21:11 +00:00
TreeHugger Robot
d61b92219c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I23832d4722bd717e48189823e8557ba268ec797b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:16:59 +00:00
TreeHugger Robot
858f84503c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib455218f3767a9d85e17d61f88392ad2c384551d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:16:54 +00:00
Bill Yi
46611a953c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie5d75ff189ee4beac391c7978d4a313868e9aa99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:16:42 +00:00
Bill Yi
52c93abc11 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If99802e1d0fba3c1d3ed91308059ada9ccaf7281
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:16:42 +00:00
TreeHugger Robot
5e4e0ee275 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie4e1f5d253455ff3aea0a1b7878d2d79f43b1b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:16:33 +00:00
Bill Yi
588d339d4d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4f573d48d312206e50d030707f37a2a3953e9332
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:16:20 +00:00
Amy Hsu
16d022942f Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014

Change-Id: I399f7592e930545ba1d9e38a62d58aa58bda5b6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:11:34 +00:00
Amy Hsu
7e0b5c8c07 Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014

Change-Id: Ie88b0db9abc05339c9c77aa87350bcd3acf963e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 06:11:31 +00:00
Amy Hsu
be6fef3095 Merge "Restore the density when it has been overridden" into tm-d1-dev 2022-06-15 05:31:43 +00:00
TreeHugger Robot
50a74572fc Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-15 05:25:34 +00:00
Bill Yi
2609fb2ccb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib54c2f3b145ff0c53809022e7baf4083d5ba1ca8
 2022-06-14 21:21:00 -07:00
TreeHugger Robot
1161c9ed5c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 838099408b -s ours am: 2fc7ce6a84 -s ours am: 7eed66e60f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6c53eae1e586f1b7ef7b15ee1b9358ad900e2836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 01:52:19 +00:00
Bill Yi
9213ae1a7d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f84049c4e7 -s ours am: b70ab5079e -s ours am: 11de0c2aea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6393f283be968c566ad2a474b7fc94bb7871b260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 01:52:08 +00:00
TreeHugger Robot
7eed66e60f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 838099408b -s ours am: 2fc7ce6a84 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4377de7bdd8de4a2532807b90f8bdbe1a49e8107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 01:42:21 +00:00
Bill Yi
11de0c2aea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f84049c4e7 -s ours am: b70ab5079e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d5286c23d1e35a4a87c5014d3b2c26e8072077a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 01:42:00 +00:00
TreeHugger Robot
0c89b33fae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 838099408b -s ours am: eb1d552ac2 -s ours am: f8a6212443 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3594742e95b30a33cee848517178b99eddb158d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-15 01:35:37 +00:00