Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
830,880 Commits 3 Branches 0 Tags
dccbbc0b587effe57fff2ec2cccee9998a7d53c3
Commit Graph

830880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zekan Qian
dccbbc0b58 Add SettingsEntryRepository with some refactoring 
1. Refactor SpaEnvironment, lazy init sppRepo and entryRepo
2. Add SettingsArguments with helper functions for arguments build, which is going to replace arguments in SPP
3. Add rootSettingsPages in SppRepo, which is going to replace rootPageNames (TODO).
4. Add button in HomePage to print pages & entries

Bug: 244122804
Test: manual - build Spa gallery
Change-Id: Iccc66f0cb7156c8aa2d9793e296c2a1a2b0e277a
 2022-09-05 13:03:59 +08:00
Chaohui Wang
44622764d9 Merge "Add Spinner & AppListSwitchItem to App List" 2022-09-05 01:08:36 +00:00
Jeff Chang
20c05fdac0 Merge "Find activity in task with same user" into tm-qpr-dev am: fc9ccbb8a0 am: a3e9c75022 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19741912

Change-Id: I1c73d09e09d56e6649d5b4d7383999ac5061b1b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:49:46 +00:00
TreeHugger Robot
c77e365900 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3c52f8b618 -s ours am: 17ea6a80ee -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19840734

Change-Id: I9252ee6faceb1c199e04064fe138b85a8b0b4aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:48:26 +00:00
Bill Yi
05393fd595 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5c77e214e -s ours am: 9a5d3b3bd3 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19840734

Change-Id: I229d3594ac84e8f487d0f7d016981736c58e8339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:48:10 +00:00
TreeHugger Robot
838df16c41 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 8498d161ec -s ours am: 0d95289d65 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19840729

Change-Id: Icb434fdcea02648136c83dee8e0c205b7055560a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:47:53 +00:00
Bill Yi
901e68c040 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 801b76d540 -s ours am: 5f24969a1f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19840729

Change-Id: I1848c3085743843f1133466ec35eeebf113133aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:47:36 +00:00
TreeHugger Robot
477047d676 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f6ff9bab2c -s ours am: c7e2a98061 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19840515

Change-Id: Ia7a567ac51e42e5f8a726b9fa2790e07aaf2763d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:47:18 +00:00
Bill Yi
1521c8cd25 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10b7ddb5de -s ours am: 50fd764f7b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19840515

Change-Id: I9a17c58b759d5a79d59c31a106532677cc6185f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:46:40 +00:00
TreeHugger Robot
073e3a8128 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 8f200318ed -s ours am: c08423e404 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19837956

Change-Id: I1590e5c90aaab56ce5d06bc903ec824e3b5ccf87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:46:17 +00:00
Bill Yi
8690f2cb15 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 004434afd9 -s ours am: 8c27215886 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19837956

Change-Id: I3a2cc2d19d5a1ad27c5163dc393e888e4369770e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:45:43 +00:00
Treehugger Robot
b8292bad5b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 10d1ebad5c -s ours am: a1311376e0 -s ours am: f6bb4eaf46 -s ours am: d9d7eff213 -s ours am: c8fdd9ee58 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205397

Change-Id: Ia978229e2fd37b92ca0da6cb7eb9d678f4e786f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:42:18 +00:00
Bill Yi
110da0ff5e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8823cf65bc -s ours am: 992c1580c8 -s ours am: 2fb6709468 -s ours am: 2134217ef3 -s ours am: 4135edf85b -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205397

Change-Id: I397e902b5ad12b61fb124364a769b1c35094514a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:42:03 +00:00
Treehugger Robot
7f47cecf69 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 25d1b9cc58 -s ours am: 6b50bc9e72 -s ours am: 30e4331ca5 -s ours am: a5abeca37b -s ours am: ad2c3c5e7c -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205396

Change-Id: I0aa96c6d40395145ddaa6f5558fe86e3a28435db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:41:45 +00:00
Bill Yi
6ce8b9c982 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d4ae9f1a4 -s ours am: 2a57ba8964 -s ours am: 13465282af -s ours am: ddc7c5a0e5 -s ours am: 4ea2bf831f -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205396

Change-Id: I7ee1f9cb5c46621122431d81c42ecadbf4c8d1cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:41:02 +00:00
Treehugger Robot
fd2d2a736f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 523a9f9e3d -s ours am: 11ace762e8 -s ours am: a5d5291504 -s ours am: c845980b6d -s ours am: 9544284b6b -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205266

Change-Id: I8c5eaf636f486f24f7f5eb98fafeac89214927f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:40:27 +00:00
Bill Yi
c05f3408a6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 005179f87c -s ours am: 49ee603cc4 -s ours am: e56d8fb7c4 -s ours am: 72c29d11f1 -s ours am: 9ab2452301 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205266

Change-Id: Ie3c6b4d161e5aefd2da675b34529bbc0eadb4cea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:39:34 +00:00
Jeff Chang
a3e9c75022 Merge "Find activity in task with same user" into tm-qpr-dev am: fc9ccbb8a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19741912

Change-Id: Ic9cdef99705a48d5675640a9522c6686787941f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:35:45 +00:00
TreeHugger Robot
17ea6a80ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3c52f8b618 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19840734

Change-Id: Ifaf50bc01f133e7ff554031bb60aadb1feeac9e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:33:38 +00:00
Bill Yi
9a5d3b3bd3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5c77e214e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19840734

Change-Id: I3e8958556e11144d793ced7a427fa1091d7a45a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:33:32 +00:00
TreeHugger Robot
0d95289d65 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 8498d161ec -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19840729

Change-Id: Id6ab6a097237aab16ccb129f4e143ad5adec50ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:33:26 +00:00
Bill Yi
5f24969a1f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 801b76d540 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19840729

Change-Id: Ib0bd867859e5470cab94f3e0e194383f259d8f9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:32:57 +00:00
TreeHugger Robot
c7e2a98061 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f6ff9bab2c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19840515

Change-Id: I274de60adeeb082fd5b90a50ba386c24fea81bd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:32:50 +00:00
Bill Yi
50fd764f7b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10b7ddb5de -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19840515

Change-Id: I7ed90f8e27b01b628f447c14a09d8212ab946f36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:32:34 +00:00
TreeHugger Robot
c08423e404 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 8f200318ed -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19837956

Change-Id: I324d9cc507e422ec9d68dbcf0e39920734035575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:32:22 +00:00
Bill Yi
8c27215886 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 004434afd9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19837956

Change-Id: Ibc0b1d06d6f6fcf967c4094c0c486a71eccbc294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:31:37 +00:00
Jeff Chang
fc9ccbb8a0 Merge "Find activity in task with same user" into tm-qpr-dev 2022-09-05 00:20:37 +00:00
Treehugger Robot
c8fdd9ee58 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 10d1ebad5c -s ours am: a1311376e0 -s ours am: f6bb4eaf46 -s ours am: d9d7eff213 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205397

Change-Id: I6821588487427f131c0a70d5c2f91b2f06fc940a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:11:16 +00:00
Bill Yi
4135edf85b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8823cf65bc -s ours am: 992c1580c8 -s ours am: 2fb6709468 -s ours am: 2134217ef3 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205397

Change-Id: Id32c3ceb6c406035d6d90b176ade5639adeed58b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:11:13 +00:00
Treehugger Robot
ad2c3c5e7c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 25d1b9cc58 -s ours am: 6b50bc9e72 -s ours am: 30e4331ca5 -s ours am: a5abeca37b -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205396

Change-Id: Ic46486c0f147b70390d7f0fb7ff9cf092497344d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:11:05 +00:00
Bill Yi
4ea2bf831f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d4ae9f1a4 -s ours am: 2a57ba8964 -s ours am: 13465282af -s ours am: ddc7c5a0e5 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205396

Change-Id: I278fa7e05ebae286c5b1ac9e166692cde27fd982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:10:58 +00:00
Treehugger Robot
9544284b6b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 523a9f9e3d -s ours am: 11ace762e8 -s ours am: a5d5291504 -s ours am: c845980b6d -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205266

Change-Id: Iafa3c5f7ca650be4a777c73dc86edf5ea1b61b01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:10:29 +00:00
Bill Yi
9ab2452301 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 005179f87c -s ours am: 49ee603cc4 -s ours am: e56d8fb7c4 -s ours am: 72c29d11f1 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205266

Change-Id: I8372431f254b937333eab50cf187ffd3a93cd5a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-05 00:10:04 +00:00
TreeHugger Robot
3c52f8b618 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-04 23:48:18 +00:00
TreeHugger Robot
8498d161ec Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-04 23:48:18 +00:00
TreeHugger Robot
f6ff9bab2c Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-04 23:48:18 +00:00
TreeHugger Robot
8f200318ed Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-04 23:48:18 +00:00
TreeHugger Robot
26615cadc0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: be02a40d87 -s ours am: f5213dac4a -s ours am: 4c9868a01e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19842137

Change-Id: I217ea3998bf48da47db19b85358b7ed69a496dd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 23:46:44 +00:00
Bill Yi
e6054abfcc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4ae2fc66d7 -s ours am: 13eca09af0 -s ours am: 328a274398 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19842137

Change-Id: Id594da8d1cc7e662d749b2ead1cc26c253982901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 23:46:22 +00:00
TreeHugger Robot
62207286af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 756fe97239 -s ours am: c67b65c007 -s ours am: b354796277 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19842135

Change-Id: I45f0e0427a3ff5a8995233d4f251830d970a8e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 23:45:51 +00:00
Bill Yi
2e6860fe4a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23b494f461 -s ours am: 705e88f7fb -s ours am: c1bcad8169 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19842135

Change-Id: Ibba4a2101d20b2530ad3ab73f04fb2779325b314
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 23:45:18 +00:00
Treehugger Robot
d9d7eff213 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 10d1ebad5c -s ours am: a1311376e0 -s ours am: f6bb4eaf46 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205397

Change-Id: I3d8d9f7907061dbc8f0d754006bf4dfe5fe32e64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 23:45:09 +00:00
Bill Yi
2134217ef3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8823cf65bc -s ours am: 992c1580c8 -s ours am: 2fb6709468 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205397

Change-Id: I870d60254bd04a937b6437fee797d5239cf4e72e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 23:45:04 +00:00
Treehugger Robot
a5abeca37b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 25d1b9cc58 -s ours am: 6b50bc9e72 -s ours am: 30e4331ca5 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205396

Change-Id: I9a2fc98ca4869dad959f805269c418b0e4897451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 23:44:59 +00:00
Bill Yi
ddc7c5a0e5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d4ae9f1a4 -s ours am: 2a57ba8964 -s ours am: 13465282af -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205396

Change-Id: I20a41ccb6aaffb6b0205a3a8eb353c59def8c97a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 23:44:51 +00:00
Treehugger Robot
c845980b6d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 523a9f9e3d -s ours am: 11ace762e8 -s ours am: a5d5291504 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205266

Change-Id: Id11c43b595aa94ce151301d14769f701c9d8d718
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 23:44:30 +00:00
Bill Yi
72c29d11f1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 005179f87c -s ours am: 49ee603cc4 -s ours am: e56d8fb7c4 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2205266

Change-Id: Ie81b7e0fb3e3d1fa3b15dee1acfc41b124ba5e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 23:43:59 +00:00
TreeHugger Robot
19c68621ca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: be02a40d87 -s ours am: 33c02ea11e -s ours am: 05d5c428ba -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19842137

Change-Id: Ib23df4d6839f38776c95bf652b526d32b11e6da9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 23:43:40 +00:00
Bill Yi
854b92b7d0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4ae2fc66d7 -s ours am: dcb2ec78bc -s ours am: 9e8a6a45bd -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19842137

Change-Id: I7c61b50a49b51ffcc6bd37acc33a4f5251ac0ca6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 23:43:24 +00:00
TreeHugger Robot
6c8ecb5daa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 756fe97239 -s ours am: fc2385a8cd -s ours am: 32ca6a5ddc -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19842135

Change-Id: I08c42d6e0c6ad9c0cf78a3aea6c6da8059672f02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-04 23:42:51 +00:00