PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,942 Commits 1 Branch 0 Tags
5f34ae03099eca699d6987bddbac496968b44adc
Commit Graph

105942 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
menghanli
51a056ec32 Polish reset display size and text dialog content 
Use "tablet" for tablet devices; use "phone" for default

Bug: 233985662
Test: Manual testing
Change-Id: I24e54315414502dc61efb733bbf697783b1de87a
 2022-05-30 23:54:09 +00:00
Automerger Merge Worker
c67e3c2433 Merge "Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 7e712ef660" into tm-d1-dev-plus-aosp am: 2773af62b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: Ibe21453ec004a904fa756bb3398a57e4953f8b26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 05:23:22 +00:00
Edgar Wang
c5c7fdfe34 Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 1767504702 am: 67e1606b5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I2d1994989ba1b97163a892e8745bd5924df946ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 05:22:50 +00:00
Edgar Wang
607b4cd97f Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 1767504702 am: 4f5a65d4bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I5f17e520e29ee4a2e5cfc5a315da159e591cf15a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 05:22:28 +00:00
Automerger Merge Worker
2773af62b8 Merge "Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 7e712ef660" into tm-d1-dev-plus-aosp 2022-05-30 05:05:51 +00:00
Edgar Wang
67e1606b5e Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 1767504702 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I1dd67111c2d18b8f41a318860ee751a3f6ec6aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 05:05:31 +00:00
Edgar Wang
e735b97709 Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 7e712ef660 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: Iec98afd8781aa28bb0d15a66382f0f9c1d8d9028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 05:05:31 +00:00
Edgar Wang
4f5a65d4bb Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 1767504702 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I0e30a9c258df97364b0ef848ed669d73e5a9b75a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 05:05:29 +00:00
Edgar Wang
1767504702 Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I584713ed38df60ecb9742f79f5cbc2e0c2ea90bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 04:36:10 +00:00
Treehugger Robot
9d92574250 Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e am: 2341b91f32 am: 22c4b4009b am: 7cf2c08b53 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346

Change-Id: I2a2d7758da7c9e8484377ecb2a6c5bdc128f2566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 04:34:58 +00:00
Edgar Wang
7e712ef660 Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I1e600321182b83edebe65bbc932222b4ea7bc4f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 04:34:50 +00:00
Edgar Wang
610538e10b Merge "Enable hyphenation on most of preference." into tm-dev 2022-05-30 04:00:19 +00:00
Treehugger Robot
7cf2c08b53 Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e am: 2341b91f32 am: 22c4b4009b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346

Change-Id: I68e18d34ee0f28caac1da18f76472082eb524430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 03:59:47 +00:00
Treehugger Robot
22c4b4009b Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e am: 2341b91f32 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346

Change-Id: I1fd069da08f2931ee00c7adb08df56fc4fb976b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 03:44:42 +00:00
Treehugger Robot
2341b91f32 Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346

Change-Id: I3435e3bf2ee61ad4be971334f791543d9c26856d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 03:27:45 +00:00
Chaohui Wang
f46186a820 Merge "Enable Kotlin for Settings App" into tm-qpr-dev am: 304a3fd37e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18655752

Change-Id: Ieb38157536c1cb746de007ac2c162e9336a3288f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 03:01:34 +00:00
Treehugger Robot
24f96c2c2e Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" 2022-05-30 03:01:23 +00:00
Chaohui Wang
304a3fd37e Merge "Enable Kotlin for Settings App" into tm-qpr-dev 2022-05-30 02:43:23 +00:00
Chaohui Wang
9ec6f0e41a Enable Kotlin for Settings App 
Currently Kotlin files cannot build with library app-compat-annotations.

Only one @ChangeId need this library, create separate build target
library Settings-change-ids to solve this issue.

After this cl, Kotlin could be used for Settings App.

Fix: 229037247
Test: make Settings
Change-Id: I4a0d99425c9e6cc2cbc015d2561daa68609ca0fd
 2022-05-30 01:58:25 +08:00
Ilya Matyukhin
28608774cb Update biometrics OWNERS 
Bug: 234195983
Test: N/A
Change-Id: I9843d0d6fad638cd14296624b11f86a273baab1c
 2022-05-28 05:36:43 +00:00
Automerger Merge Worker
be7287840a Merge changes from topic "am-0e4ff05ba9ce4e1494489f29f1a9e967" into tm-d1-dev-plus-aosp am: fd82bd854e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627527

Change-Id: Ic2007474306dfefa55b6ee1db15c781ca5dca346
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 18:07:31 +00:00
TreeHugger Robot
4f77fe31cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 460dcee74b -s ours am: 8961fbeada -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I67bfeaaa818552b3fba439f41b183ee9979d43f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 18:07:09 +00:00
TreeHugger Robot
60ed9dbd53 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 56da28b680 -s ours am: 0a6b06ad2c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I84bbae7dd3b62f8d91e90a44afed0a0ac4faec31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 18:01:55 +00:00
Bill Yi
3f1595dfb4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours am: cda0c42d9e -s ours am: 6352a444cd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I12e1990cfd194b4f0696a414c9b8013d34aa62e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 18:01:45 +00:00
TreeHugger Robot
d6db69358c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours am: 0f7ae55fd9 -s ours am: d221387e32 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0383c6ad130b1fb9ab77e90a2becf4ac1879a58b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 18:01:29 +00:00
Bill Yi
944416da76 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours am: d9de74c23a -s ours am: 5c1d9fb325 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35315fdb8fc4ba969819ab625bef7039fde62e66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 18:01:11 +00:00
TreeHugger Robot
ab134299ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 56da28b680 -s ours am: 7b75a759ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08d2bf4a2e334c3646b7da5a3ee604e49d5ffdf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:41:38 +00:00
Bill Yi
f16931bcd5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours am: cda0c42d9e -s ours am: f3ba7e3f06 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3631c73faa64d9783d04027e2ce3e1e14817beec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:41:29 +00:00
TreeHugger Robot
4f5208759c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours am: 0f7ae55fd9 -s ours am: 2ba92e1138 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a33f067121867a97bec28d5a47c0c3288feaeb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:41:14 +00:00
Bill Yi
c5c54308a6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours am: d9de74c23a -s ours am: fcf0332625 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3b4dad4b7b9d720dab4ead8b05085f99ea9138e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:40:55 +00:00
Automerger Merge Worker
fd82bd854e Merge changes from topic "am-0e4ff05ba9ce4e1494489f29f1a9e967" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 460dcee74b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours am: 496b722a23 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours am: 7307f75d1e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours am: 684e2ab4bd -s ours
 2022-05-27 17:16:07 +00:00
TreeHugger Robot
8961fbeada [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 460dcee74b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9d4f41f4aa4f17c2e770edc58f4068d076e568c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:15:14 +00:00
Bill Yi
cdd9bce547 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours am: 496b722a23 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6c6b803fbeedab5f119176aee5e0756e9335c67f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:15:02 +00:00
TreeHugger Robot
0a6b06ad2c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 56da28b680 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2af98aa8a4a359128f1b8f590c1acd066e560f4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:14:45 +00:00
TreeHugger Robot
dc033558a7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours am: 7307f75d1e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If5fcec185f9a87fd95fd8465bc2fdfed4f76f8a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:14:45 +00:00
Bill Yi
6352a444cd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours am: cda0c42d9e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6c5abe00d12f63faddb3d18a84b1ffe79e694d68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:14:34 +00:00
Bill Yi
6a02a6a18a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours am: 684e2ab4bd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4796260a9141a72a4c95dfd5316ee50ca1283fc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:14:31 +00:00
TreeHugger Robot
d221387e32 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours am: 0f7ae55fd9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I10d5179a433ce1ff84fb5707dd4bb89eac3f75b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:14:18 +00:00
Bill Yi
5c1d9fb325 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours am: d9de74c23a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic26eb391782892a26649ccd080acdda511938a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:14:01 +00:00
TreeHugger Robot
7b75a759ac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 56da28b680 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0afaecd36ca72d2f3d678f59feab3bb0abd4fc82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:12:59 +00:00
Bill Yi
f3ba7e3f06 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours am: cda0c42d9e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5565696d5dddc6468dfbd6add59b29f19093178e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:12:49 +00:00
TreeHugger Robot
2ba92e1138 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours am: 0f7ae55fd9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibe970d983b9836ee7b1cf596fc3c450cc2ff706a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:12:33 +00:00
Bill Yi
fcf0332625 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours am: d9de74c23a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3fb0dc099644deff88e0bb8b8268ee3a70af3591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 17:12:15 +00:00
TreeHugger Robot
460dcee74b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If9a0a56197a12a7d7bc178d0bec11559e8d7c9e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 16:56:21 +00:00
Bill Yi
496b722a23 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5cce0ab8e7413f6e3ddf4fe7b1cd0321d3561fcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 16:56:15 +00:00
TreeHugger Robot
56da28b680 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I43e638073a5b58e2e72866101e72ecd66c865aff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 16:56:13 +00:00
Bill Yi
cda0c42d9e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icabe13a3d76f22248a3fc6f27f9d8f206232548a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 16:56:09 +00:00
TreeHugger Robot
7307f75d1e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6eb2fd9487f6c77e5d62e5c0981d77ed3a977d5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 16:56:00 +00:00
TreeHugger Robot
0f7ae55fd9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0bba91cc0b512d6c8fdabbe84e1f12b679e76b09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 16:55:56 +00:00
Bill Yi
684e2ab4bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I32a92c567c667bd8a987b99d61c8fb01f9b058c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 16:55:36 +00:00