Commit Graph

766002 Commits

Author SHA1 Message Date
Bill Yi
d743e00a80 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 672b558080 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icf72c399dbfb2b010a0e52c2c939de21ac8fcfbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 01:32:03 +00:00
Bill Yi
52ae88bd7f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3e03ba4834 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibfcfc932704853e91d5fcfd7d416fca0fbc15700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 01:32:01 +00:00
Bill Yi
ff8109976b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 6b55f3d8d8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1ef434606a985b4bc3b4483ea3d242a9547a0e25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 01:31:58 +00:00
Bill Yi
cdf626ea2d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75001a0891 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iab94a4df0cdb7e94771f1ca9ed5b8e32256b9a5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 01:31:56 +00:00
Bill Yi
ea8d68f592 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 325fd3fbc7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6f89ee9522e505e5a2f2b63b5aa4bb4693e73802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 01:31:54 +00:00
Bill Yi
c53abfce7b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c8749b96c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7c36824a14d1608d26088e42eb045067359d303a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 01:31:28 +00:00
Bill Yi
55ecb072a0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: b6a38cd57b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3ce9c230de6dc5541ed4f3a1924adc698b74ea47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 01:31:15 +00:00
Bill Yi
f2e6d98022 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc73f4e5e7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I72fc0fd49238bed56302d0dbd3045f10c1080d5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 01:30:50 +00:00
Bill Yi
ec0243ab85 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c54430b0b5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7b3664c517c37bcdf5dc757704731e9d07fbbe0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 01:30:31 +00:00
Bill Yi
b4003121bb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f825b7e8b9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I375a31ad974387435ee92b13cb896c9c6249eb45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 01:30:15 +00:00
Riddle Hsu
98a9d1ffdb Merge "Demote top app scheduling group when unlocking" into tm-qpr-dev 2022-05-19 01:21:20 +00:00
Bill Yi
672b558080 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-19 00:41:40 +00:00
Bill Yi
6b55f3d8d8 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-19 00:41:40 +00:00
Bill Yi
325fd3fbc7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-19 00:41:40 +00:00
Bill Yi
b6a38cd57b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-19 00:41:40 +00:00
Bill Yi
c54430b0b5 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-05-19 00:41:40 +00:00
Riley Jones
7a8fa9b1f2 Merge "Fix for out-of-bound error regarding NoCopySpan objects" into tm-dev am: 92e59dde2f am: fcd285b64a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18441236

Change-Id: Id21bbba7751a8dcef3c9c0660320ea4daec8d405
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:51:30 +00:00
Hai Zhang
d7b20b9e21 Merge "Persist permission state for updated apps synchronously." into tm-dev am: 5309004a73 am: c022b030e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18439740

Change-Id: Ieac47537a8426dc857cdc49a80acae386793ab8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:50:56 +00:00
Hui Yu
0e58102d79 [automerger skipped] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into sc-dev am: f6e715f998 -s ours am: abb06fd681 -s ours am: 80e3a1f8fe -s ours am: 0fca1ee02a -s ours am: 09dfad10f9 -s ours
am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 eef20391ce is already in history

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

Change-Id: Idd283bd52b0439c8aea24d91a3c9105c53c169a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:50:18 +00:00
Hui Yu
9db44001d6 [automerger skipped] Merge changes from topic "cherrypick-SPOOF_PACKAGE_NAME-zoqa9prsry" into sc-qpr1-dev am: 16f330db3f -s ours am: dc46b391cf -s ours am: 443fce4cec -s ours am: 50b3cb43d5 -s ours
am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 023509e487 is already in history

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

Change-Id: Ie98f8d2d418b2ca12fb97be1c2289984943da4c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:49:59 +00:00
Presubmit Automerger Backend
9341edce68 [automerger skipped] [automerge] Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions. 2p: eef20391ce am: ca3e85e57a -s ours am: f2c58bf73e -s ours am: 869d4e32f0 -s ours am: 24d5e6a127 -s ours
am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 023509e487 is already in history

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

Change-Id: Idad0eae415b1fbd91dd89a5e978db5c506345aad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:49:57 +00:00
TreeHugger Robot
30a0204cc5 Merge "Fix switching a background task into split screen unexpectedly" into tm-dev am: 2a3709618b am: 85edc35835
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18425971

Change-Id: I5c715f4f9ce776e093309244d0aa2a9f5471ced3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:49:16 +00:00
Riley Jones
fcd285b64a Merge "Fix for out-of-bound error regarding NoCopySpan objects" into tm-dev am: 92e59dde2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18441236

Change-Id: I08ad40cc9341b76f67551da0791b9c94109924ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:48:54 +00:00
Ben Lin
8f049afdf4 Merge "Apply PiP Params if there was a deferred info." into tm-dev am: 26b096d288 am: 2bbd40e21b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18380631

Change-Id: I260e95b48c681eb89929b05421286f5cdd8f66fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:48:20 +00:00
Winson Chung
ce8f9488f2 Merge changes I1978ce3a,I79160004 into tm-dev am: 35640f948e am: d0cd381a0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18385451

Change-Id: I80e97f57ea58634ecc647bccded63ef15615c558
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:47:35 +00:00
Hongwei Wang
96aabf1116 Merge "Add null-check before reparenting content overlay" into tm-dev am: c3b917ad97 am: 4e5905d45a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18439341

Change-Id: I36e4beed8e2e4523890fd699fbb1d088ae750359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:45:45 +00:00
Hai Zhang
c022b030e4 Merge "Persist permission state for updated apps synchronously." into tm-dev am: 5309004a73
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18439740

Change-Id: Ie7988b31e7d527bf7333c8b90ecbda40f4e3a6c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:45:26 +00:00
Chavi Weingarten
db42ad219a Merge "Don't inflate mSplitDecorManager in sync transaction callback" into tm-dev am: fd304f2fbb am: c6b95882ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18445265

Change-Id: Ie323129dd07efde8fed94bb982db29ce089d0e47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:45:19 +00:00
TreeHugger Robot
641153ac17 Merge "Add latency instrument for loading share sheet" into tm-dev am: 5843318c84 am: 2ef01eda02
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18157815

Change-Id: Ie2b1189c401833c040c53c92bf30d1740506cbfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:44:50 +00:00
TreeHugger Robot
1c2d27cb88 Merge "Updated the document regarding T data stack" into tm-dev am: fa4a7135fd am: 792fa5f8a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18439685

Change-Id: I4ab8bc710ba4a3ad736ba2ca592a59939a00b842
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:44:20 +00:00
Hui Yu
09dfad10f9 [automerger skipped] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into sc-dev am: f6e715f998 -s ours am: abb06fd681 -s ours am: 80e3a1f8fe -s ours am: 0fca1ee02a -s ours
am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 eef20391ce is already in history

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

Change-Id: I72fd425675d95fd5b38a77a106ae2627967a2597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:44:03 +00:00
Miranda Kephart
089ebd5dad Merge "Make sensitive text/image both look the same" into tm-dev am: 22703341cb am: 76e43fa2f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18414113

Change-Id: I4d7ae043018f86795dc09b9814e9e6d9e91ddce5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:43:55 +00:00
Hui Yu
50b3cb43d5 [automerger skipped] Merge changes from topic "cherrypick-SPOOF_PACKAGE_NAME-zoqa9prsry" into sc-qpr1-dev am: 16f330db3f -s ours am: dc46b391cf -s ours am: 443fce4cec -s ours
am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 023509e487 is already in history

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

Change-Id: I10281d4d3949a422444d3747d681f571b88557a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:43:54 +00:00
Presubmit Automerger Backend
24d5e6a127 [automerger skipped] [automerge] Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions. 2p: eef20391ce am: ca3e85e57a -s ours am: f2c58bf73e -s ours am: 869d4e32f0 -s ours
am skip reason: Merged-In Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89 with SHA-1 023509e487 is already in history

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

Change-Id: I9151d94ddbc9d7b355dceb159a78007066d29c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:43:52 +00:00
Miranda Kephart
163645abc7 Merge "Add share button to clipboard overlay" into tm-dev am: 300b970951 am: 725cea8b81
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18366672

Change-Id: I6f4670f0fbbd1ff9a066c6211aa6b1c31b4aa103
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:43:34 +00:00
TreeHugger Robot
85edc35835 Merge "Fix switching a background task into split screen unexpectedly" into tm-dev am: 2a3709618b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18425971

Change-Id: I2b5f0d020e7f321bb1336003cdb25af3345c8a6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:43:29 +00:00
TreeHugger Robot
c1d3c7c0ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 33674c8375 -s ours am: 561f044276 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia4841d3ca377b9f30e7fc416fa0e3fe0c8f6fc40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:41:49 +00:00
Bill Yi
3a331ee92c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 07f947dcb2 -s ours am: 7c840a6ed8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1724fd5db4e7b0db1291d40803fe558c9068653c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:41:36 +00:00
TreeHugger Robot
1a577820f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 89da1d5f66 -s ours am: 7aef58d73c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie291bcd87277baf7ffd5b6343bd4d34459096ca6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:41:20 +00:00
Bill Yi
c123474fbd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 618077df84 -s ours am: be55a46fec -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie4adefeb7263279197c1bd7120135992beb3a8af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:41:06 +00:00
Ben Lin
2bbd40e21b Merge "Apply PiP Params if there was a deferred info." into tm-dev am: 26b096d288
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18380631

Change-Id: I526d20df9e5a5d9672619268bdc48ba9ce9e98f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:38:57 +00:00
Miranda Kephart
93aa8e2612 Merge "Hide edit buttons on clipboard and clipboard smart actions" into tm-dev am: be2681d3e9 am: 6c3e0cf8b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18374702

Change-Id: Iebee8de18f06902b273d79bc525e275dbdb61390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:38:00 +00:00
Fabian Kozynski
69de5cf7fb Merge "Do not use mStaleListener if tile is listening" into tm-dev am: 5834bd57e7 am: 4031509716
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18368340

Change-Id: I226a36b6168080d587f4245e5577e61fb0bf1278
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:37:13 +00:00
Bill Yi
e28f20cec3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 66642324cb -s ours am: 1a217a1251 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I679e99a9ba7fca989f4e4a467a107db2a406552c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:36:24 +00:00
Bill Yi
ecfc21c1f8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0e42264ef -s ours am: c6c4293237 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4be1c721f6e77c4db1b865018f025c0e9ef9239c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:36:22 +00:00
Bill Yi
6d0300521e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6d58653a3f -s ours am: 48bf092efb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I080544945bb072fe1a1721b625b755147204ae42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:36:21 +00:00
Bill Yi
f0ca84d07d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5badf4f771 -s ours am: 8f2e88bb1e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib884f947cd88d7779b814acfbfecdb9e80fd0237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:36:19 +00:00
Bill Yi
c06d0c605c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a558ca9d52 -s ours am: d223c17d78 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic1910c19e904b2484643cf5d803ea8c6690bc461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:36:17 +00:00
Bill Yi
92a8d46089 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2562a79f40 -s ours am: 637f8d73dd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id1894ff80acb9958195acfa2c8fd5f50d509a138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:36:15 +00:00
Bill Yi
7ab76befeb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6196522099 -s ours am: 05e855bdf3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9e147e807c3a2ff83327c9787c61be2619b7ad80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:36:13 +00:00