Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
764,164 Commits 3 Branches 0 Tags
006fa97387a58f65eb188d658d7052a30c9764bb
Commit Graph

764164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Issei Suzuki
006fa97387 Merge "Suppress app transition while recents is running" into tm-dev am: fca1e25c59 am: b1050a102f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18232543

Change-Id: Ida53de8a528cd005ff997280c47ef1afac74fdce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:41:32 +00:00
Matt Casey
7a6a65f5a2 Merge "Allow dev tools to suppress clipboard overlay." into tm-dev am: 627b6b9c8f am: 7556bd6a8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18205875

Change-Id: I4d4fa1fafeb5981d7534697dcd35d42e46678a3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:41:20 +00:00
Nick Chameyev
055b141d36 Merge "Update cache key calculation for statusbar insets" into tm-dev am: 0547aacfd2 am: 103dfab71a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18184943

Change-Id: I88fe37e03812a426766274e1198f82cf5d00e917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:41:09 +00:00
Shawn Lin
37cb5d6000 Merge "Add multi-user support for kids mode" into tm-dev am: 3ab2eccace am: 4f89de8b35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186214

Change-Id: I3335e98b7286b05095649fecc643e00034a98c53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:28:44 +00:00
Jing Ji
7e2be8aa00 Merge "Add the missing lock on the process start timeout handling" into tm-dev am: 9bcc78687c am: abd11d63b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18242014

Change-Id: Ie42ca6045c47c78e62c570d0c507f46a993d60c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:28:17 +00:00
Bill Lin
23fb59dfbb Merge "Dismiss Auth Biometric Prompt when expanding shade" into tm-dev am: ff1fb27b6d am: a237cddd64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17938077

Change-Id: I4a1e04c38c21599493211df814fb06571ed6de9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:28:00 +00:00
Oli Lan
621013b459 Merge "Fix avatar picker issues relating to screen rotation." into tm-dev am: 9d1cf05c83 am: 9722ab7dcd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231666

Change-Id: I9d602007fc7d278875c84bcc64550a46d64cbb31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:27:35 +00:00
Tsung-Mao Fang
59f84c4e05 Merge "Create an #isAppInstalled() util method" into tm-dev am: b8b3d5e1ef am: 2bceeb9dbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188769

Change-Id: I536f299ab22ce5336b3fd008d45406808115ed32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:26:56 +00:00
Lucas Dupin
69824b1a37 Merge "Revert "Scrim now only scales horizontally"" into tm-dev am: 68e57d454f am: d601e05eaf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18236681

Change-Id: I6b49f9a32661f4dbe2219cd893148ca301801155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:26:01 +00:00
Silin Huang
2e6e7b1397 Merge "Revert "Use callback executor when querying wallet cards from QAW client."" into tm-dev am: 33350105bc am: fd134f81e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18235024

Change-Id: I4e6751d9e12d570e9d644291e8b7a82f858a3dbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:25:26 +00:00
Bill Yi
992fa5db62 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1235b9d66d -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I036bdc219b28495f86c9b5c06ddb7700c1f09bfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:24:02 +00:00
Bill Yi
ff3a970c29 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: fee89896d0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifcc408a2f8b03d42d7658016383bb503a6a8f696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:24:00 +00:00
Bill Yi
525bc4791d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13900741cb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibe5a893d7b5e9de0d5bbfe23b148a34c248ae7f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:23:58 +00:00
Bill Yi
c5c56e1a18 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d08b1f2353 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3bc30267c010c97274fd2a65c6d5e3fb654ff3e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:23:56 +00:00
Bill Yi
894067d8df [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: feece10dc8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If54ea2aa57c661f8eca0dfbd0c298d8181f4c3f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:23:55 +00:00
Bill Yi
cf03380b71 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 41ff699af8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia73ded883d98a56de02b19fcce95b90777e4f250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:23:53 +00:00
Bill Yi
ea75098201 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c4c543c6b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I238561e9649621bfec1198111042b49a7b4fb0b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:23:51 +00:00
Bill Yi
dcc0172bcb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: e5376c7aa2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3cc5515e0564848c47120541758f4fb37470d6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:23:48 +00:00
Bill Yi
7b91535e71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bfd98a194d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I10a9679e2ba73116a1832d9a4eac2f4958ead287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:23:39 +00:00
Bill Yi
29adeb4e6e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f86a149616 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a892abbbb8fed6da74c7ae4f3979afea8f106f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:23:31 +00:00
Bill Yi
0f0b67634e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2293a3c07a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I04fbcbc6fd0b0d1c291c4b59ca8e5966df730a69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:23:15 +00:00
Bill Yi
19b853462a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: eb894d007d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic3082497e024a7a807414cf5a106991f93a51848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:22:57 +00:00
Bill Yi
3469318c6f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6676c1f7fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibdc16b4a681571d4d897e5958b079720d3cfd6ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:22:42 +00:00
TreeHugger Robot
9b1d768aa0 Merge "Fixing "adb shell cmd statusbar expand-settings" command in split shade" into tm-dev am: 8b644effca am: a246fe9a04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18140153

Change-Id: I8c28bf01a11ea7547580efd19990a2b6358360b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:18:17 +00:00
Chilun Huang
b68a1a318f Merge "Destroy the last embedded activity immediately" into tm-dev am: 5f99fcc0ec am: 7efeba7da0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231723

Change-Id: I806b0c686754e0555c2e318df48d765ccddc9551
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:18:06 +00:00
Prabal Singh
f045939e7f Merge "Minor refactoring in WorkPolicyUtils" into tm-dev am: 9cb05eaa75 am: 5eee437dcd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164348

Change-Id: I40f35e571f2f9d59d147fcb1255909f7c5bcc282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:17:54 +00:00
Chaohui Wang
8b11b98210 Merge "Add validation TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 4f4e8dd340 am: 92c8f95c4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17799990

Change-Id: I77b1e8973868e27368f72bef0711b289f6a6b55f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:17:41 +00:00
Chris Li
499dfefff6 Merge "Remove pendingAppearedActivity when activity is destroyed" into tm-dev am: c9ab8713b8 am: f65980ca69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186206

Change-Id: I0dcfa4a9565dfbda4346a9fd059bdd07772dec12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:17:08 +00:00
Joanne Chung
0d798039e6 Merge "Remove drop shadow below on the fill dialog" into tm-dev am: abe0730018 am: d3ccf67045 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18185262

Change-Id: I5fda93d2d31d2909e7c7090b2a51e1846627ec7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:16:57 +00:00
Bill Yi
f16ea4d8cd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: e8e3c051af -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I691b29513e5868bfc70ff1f076f52083dc76222a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:15:48 +00:00
Bill Yi
a39aef2961 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d08b6f8998 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d90b488377c1260e4ab4666f4befbe19ed92be1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:15:47 +00:00
Bill Yi
b5db62a2d6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 42338b61e1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4958035301d0ce7d732641dc2b24fad3ac57fbef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:15:45 +00:00
Bill Yi
31d37abc4f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a49ef89c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5dbaca7a1e944f4ba08f7f7ca01059784335bafa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:15:43 +00:00
Bill Yi
703dbb4381 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 79aafd5ff7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I388cf041b0b96295079bc6b3a5de4f2fda574d09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:15:41 +00:00
Bill Yi
f996b3b7dc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fac11d6d63 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I05c3ae8af2a87f8408a1261fc1bca13a7d975a61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:15:40 +00:00
Bill Yi
7d13b4d7ab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 9680f19a5a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I42bb2fe8abf69dee8c8790ed3abb7b1483bbd3bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:15:33 +00:00
Bill Yi
5ad1e6afc0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: da6ce8c441 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id5cd2c5fc99b6ada9b792601c972db5cd5fd794e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:15:23 +00:00
Bill Yi
fcd020af19 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8a9296ae9d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0351241ed144b9460a6427f7e0796a95d2f0648
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:15:05 +00:00
Bill Yi
9a2c650b0b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c81a54a2bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If98a63979ce82fd3aee91e0a971aec254b92d203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:14:46 +00:00
Joanne Chung
d457303160 Merge "[DO NOT MERGE] Remove selection toolbar code from build time" into tm-dev am: 070275dcae am: ae8330e7f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18162825

Change-Id: If21e4639edd3cf3ebc4b541b7207ed39dd0c5bba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:07:22 +00:00
Joanne Chung
2a258726af [DO NOT MERGE] Remove selection toolbar code from build time am: ade911b9c7 am: 2f1d74e382 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18162825

Change-Id: If2545f01d020403281520a088f179aef9a0d9c74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:07:20 +00:00
Steve Pfetsch
977d3bf3eb Revert "Enable gesture debug log for a test failure" am: 827c5557cd am: 7e1518cc0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18242198

Change-Id: I76ac4be1a81af54a53c6d8a2ba28531e95b67c26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:07:08 +00:00
TreeHugger Robot
5fbf943bf2 Merge changes from topic "tc_change_20" into tm-dev am: 932e0369e9 am: a04e35fbb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18216823

Change-Id: I670c27d65339e84a35fa2676bd329fe2fde12dae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:06:02 +00:00
Bill Yi
d1e2a18153 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4342e079e am: b298154072 -s ours am: 9fb08e3f6e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4396192cdf79cb306cba87c63afc5090d3364f8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:06:01 +00:00
TreeHugger Robot
0e5dae5ff4 Merge changes from topic "tc_change_20" into tm-dev am: f952acfc23 am: 6ed8149959 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18215449

Change-Id: Icd02a7610c7a3597ab3560b96cabf1c27e16e069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:05:59 +00:00
Bill Yi
a75d103acf [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: efe0a3ec52 am: 233cc84b4a -s ours am: f3a4a4cc79 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I627e32acfdfa97ed784b614dd20ccfbb946f8352
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:05:57 +00:00
TreeHugger Robot
408cbdf21c Merge changes from topic "tc_change_20" into tm-dev am: 7e37bbb2b6 am: 722f587831 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18215652

Change-Id: I06545ae39de9088fcf7a0d16ec1752e67cc20c84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:05:55 +00:00
Bill Yi
de3d6da36d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c911af5a2f am: c234000a5f -s ours am: 852573d4eb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc5d50bd9cc5ecad2da644edfc5226006a0fe3a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:05:51 +00:00
TreeHugger Robot
8efcac925b Merge changes from topic "tc_change_20" into tm-dev am: 697cc4c631 am: 4c7d273abd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18215657

Change-Id: I9ea8e09777989d4d373e06f1db85abf19d816686
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:05:48 +00:00