Commit Graph

762956 Commits

Author SHA1 Message Date
TreeHugger Robot
a44e2bda90 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a6e4af9040 -s ours am: 071c2b9ac0 -s ours am: 32172eb2e5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaa070a2db45e8aaafab7a077cc2a425267d60dcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:10:56 +00:00
Bill Yi
e3ec139a71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b3f6a91e3 -s ours am: 2ef4ce5ceb -s ours am: 178ceb0694 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie7006c85913d0e9d74b9d8f22244eeb991b38d97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:10:50 +00:00
TreeHugger Robot
7770b742e3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 1dcb6f1d93 -s ours am: 29b6ac4039 -s ours am: 4dbc6dbba7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I58679e4d450858d53d97d7a55d5678e3b8f86b25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:10:33 +00:00
Bill Yi
c90b69381f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3b14e926a -s ours am: 2b96af4216 -s ours am: 762a2f88f3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib6fa282c3baf8ba22a029ba1990548beb45cd947
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:10:14 +00:00
Louis Chang
f6d331b3b5 Merge "TaskFragmentParentInfo should be updated for LTR/RTL changes" into tm-dev am: 4e073427ed am: 8ffffd65b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130747

Change-Id: I4d9b134d9d7b81fd3691b21d33ca470d39d43d44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:50:48 +00:00
Louis Chang
64f54a6c74 Merge "Execute pause timeout only when attached to a process" into tm-dev am: bdeddd7629 am: a1f39bcc0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18134122

Change-Id: Ie91ba8b637b339068277daddf85fcfb164bd9902
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:50:31 +00:00
Alex Buynytskyy
aa28895197 Merge "More robust restorecon and additional debug info." into tm-dev am: 8169e839ca am: a18cf5d20f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18129666

Change-Id: I368d79be328a7736756bf101008c9b3dab8ffacf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:50:13 +00:00
Lucas Dupin
b43f54f27a Merge "Revert "Do not ignore forceReload requests"" into tm-dev am: b681d512ab am: 8f106b97ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130402

Change-Id: Icadfc2c55339cf6a8fd57a649a332a15a03ab04f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:49:53 +00:00
Hawkwood Glazier
1e944284b9 Merge "Fix corner clipping on UMO" into tm-dev am: c1170e1cd8 am: a7423d6294
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944767

Change-Id: Id736e09e159fe57c6960dd51ac6b4340e6db7762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:49:34 +00:00
Hui Yu
6551471d19 Merge "canStartForegroundServiceLocked() checks both UID and binding client UID." into tm-dev am: d7f6a11db4 am: eb12b1ce32
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18011485

Change-Id: I528515fa9e66816d8ad13d5d46339c695994f2c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:49:14 +00:00
Dmitri Plotnikov
63f6625add Merge "Address proportional counting for out-of-order timestamps" into tm-dev am: 860fe90fbd am: 892520724e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18062923

Change-Id: I84bb17f4a2aef66253c0fb8072d82fae10ed302b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:48:55 +00:00
TreeHugger Robot
32172eb2e5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a6e4af9040 -s ours am: 071c2b9ac0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idae96035c9f165c147ba39946563cb328349a15a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:36:12 +00:00
Bill Yi
178ceb0694 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b3f6a91e3 -s ours am: 2ef4ce5ceb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I616a007b0ac87956acd260d0024570b4f2d87e38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:36:03 +00:00
TreeHugger Robot
4dbc6dbba7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 1dcb6f1d93 -s ours am: 29b6ac4039 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id4e23bf6ee9e93ec5cfed4e06a87bf0443a10ac8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:35:43 +00:00
Bill Yi
762a2f88f3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3b14e926a -s ours am: 2b96af4216 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4f06ca110e41df84da8cd093e0c5d3666b0984fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:35:25 +00:00
Louis Chang
8ffffd65b5 Merge "TaskFragmentParentInfo should be updated for LTR/RTL changes" into tm-dev am: 4e073427ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130747

Change-Id: Ia83af1566f463b3b6ebde633108689f02adef2be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:31:14 +00:00
Louis Chang
a1f39bcc0c Merge "Execute pause timeout only when attached to a process" into tm-dev am: bdeddd7629
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18134122

Change-Id: I0796aad920eab4586290bcdad644b500e5b6610e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:30:41 +00:00
Ilya Matyukhin
e885bfa511 Merge "Add onUiReady to AlternativeTouchProvider" into tm-dev am: 6bcd7fdc9a am: 1564ee9dcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18129622

Change-Id: I062e2188051aa6aebcaa2155b26c683bb8a5c39d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:30:14 +00:00
Alex Buynytskyy
a18cf5d20f Merge "More robust restorecon and additional debug info." into tm-dev am: 8169e839ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18129666

Change-Id: I70d164407767133370c4c8cd50252b6cc572ed26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:30:08 +00:00
Hawkwood Glazier
fe4ded55ad Merge "Fix Squashing Issue on UMO Background" into tm-dev am: 7d130a7e1f am: 0ea784a667
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18122353

Change-Id: I97cd1c09ec158e84a79b5f5c83378f91b8ebb742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:29:55 +00:00
Lucas Dupin
8f106b97ae Merge "Revert "Do not ignore forceReload requests"" into tm-dev am: b681d512ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130402

Change-Id: I712688ed1f4b5622575a10cd80a241c36ecc354b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:29:40 +00:00
TreeHugger Robot
43200e0df9 Merge "Add hidden constants to allow the role holder updater to specify the failure strategy" into tm-dev am: a3ca84f805 am: f5f646bf3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18093642

Change-Id: Ie98830bc714be8e0a90f96667555dcdf00074f5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:29:34 +00:00
Hawkwood Glazier
a7423d6294 Merge "Fix corner clipping on UMO" into tm-dev am: c1170e1cd8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944767

Change-Id: Ic02b30ef20620f95185eaee081506dddd57303c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:29:04 +00:00
TreeHugger Robot
8c855c6e46 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dcf2d1da52 -s ours am: 2ffa916b4e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ice532356335a5d9817e3e95b27af3a9010996d42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:28:50 +00:00
Bill Yi
686fda7c64 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfb5f8405 -s ours am: e4ceca1e31 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie302a1c86faf7849ddb397fceb207ae8778753a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:28:49 +00:00
TreeHugger Robot
4165978c70 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 66688f0d8c -s ours am: 9fc2570531 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic53243f60713b14dc167e9c1842d6a04cf545075
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:28:46 +00:00
Bill Yi
b48e87a72e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5a2b084482 -s ours am: 689cc72e26 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If03a6d16145d9d42bc04eb9200ef9361cd5052a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:28:40 +00:00
TreeHugger Robot
24d3a328d4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6666ab2b4e -s ours am: 046354c916 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia3dde0651dd00014115e7887c0261fcf94649455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:28:38 +00:00
Hui Yu
eb12b1ce32 Merge "canStartForegroundServiceLocked() checks both UID and binding client UID." into tm-dev am: d7f6a11db4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18011485

Change-Id: I2544c2f5b2fed270fc35237b429ba973461b69d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:28:31 +00:00
Bill Yi
2aaa6a4b62 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b877f7d946 -s ours am: 510c5dcf82 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icb22e91ddc89c03d38ef7e252a1342dd7c501d41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:28:22 +00:00
TreeHugger Robot
881b8abdcf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8625d03046 -s ours am: 5528905c70 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0591cc44c0a5726f87274355c3c3b2e96a3d05fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:28:02 +00:00
Dmitri Plotnikov
892520724e Merge "Address proportional counting for out-of-order timestamps" into tm-dev am: 860fe90fbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18062923

Change-Id: I456c74d68d363ae519d24817d59bd2ca4f1c855e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:28:00 +00:00
Bill Yi
258497440a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00fe9973d7 -s ours am: 7dcfe1aa66 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I73e8ef4921ba917ef965b5f35e2ba34373ff7842
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:27:44 +00:00
Ilya Matyukhin
1564ee9dcc Merge "Add onUiReady to AlternativeTouchProvider" into tm-dev am: 6bcd7fdc9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18129622

Change-Id: Ie2faa94114f533760485fb7e6eb6540121dd2cc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:26:34 +00:00
Hawkwood Glazier
0ea784a667 Merge "Fix Squashing Issue on UMO Background" into tm-dev am: 7d130a7e1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18122353

Change-Id: I29f5fb65309c3127935245b9ef206176c50a8e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:25:52 +00:00
TreeHugger Robot
2f014d2dc6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a1be19e3e5 -s ours am: d19ad48b3f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I293a1850f216b1efd4f5051234039bb018559512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:25:40 +00:00
Bill Yi
bf53ab07c0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96faf872fe -s ours am: ac2b68ab9b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib0a8c2b27e7b8df2e2781f027a63e184a0a8c142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:25:38 +00:00
TreeHugger Robot
5c0fea076c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b8370b3ff4 -s ours am: a752dda555 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iab6f48c4829dc7a76f5096104552c12e36c63195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:25:32 +00:00
TreeHugger Robot
f5f646bf3f Merge "Add hidden constants to allow the role holder updater to specify the failure strategy" into tm-dev am: a3ca84f805
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18093642

Change-Id: I39ec118e8bb0add5efb9f6edf87b34952b2e9b4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:25:19 +00:00
Bill Yi
f7c9f7ed59 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7b1f30c48 -s ours am: 235faa6cf5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I57a1a6234c1cb3cd0d82ee6ba272cc561ec39ee0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:25:14 +00:00
TreeHugger Robot
e3cf26989b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 4ec0434ad4 -s ours am: 9ef390ab2d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibb9377a112c6920f4466e3fc1996786606acb4de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:24:51 +00:00
Bill Yi
fa0d29c246 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 228ecd8c0d -s ours am: b73fcc9a89 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iabfa7a7cf2b6a9fb3076305933327d4f58076fec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:24:28 +00:00
TreeHugger Robot
2ffa916b4e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dcf2d1da52 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5052d1205b8f3fb1bcef585fbe8b3142a8377196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:23:51 +00:00
Bill Yi
e4ceca1e31 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfb5f8405 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I313ff391db32cc45632009792ef6f1f1d51a8013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:23:47 +00:00
TreeHugger Robot
9fc2570531 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 66688f0d8c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie5c33e5b2732eb43ed8d26b01f9cb10bb766b558
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:23:45 +00:00
Bill Yi
689cc72e26 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5a2b084482 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I82be0e8bd8e9f156b07a646d68568739dd15409e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:23:37 +00:00
TreeHugger Robot
046354c916 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6666ab2b4e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iba61f69ef8717816b930f67f0da41e57649dfc85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:23:31 +00:00
TreeHugger Robot
ae729d21cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 62a0f916e3 -s ours am: 95d7e085ee -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id9eb58cc0012d43c12bca38bed143916c7d5854c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:23:27 +00:00
Bill Yi
61d0a76314 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bd868b63f5 -s ours am: aa3f4ac580 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia2dea74e04043777e961fc5076b34e4c787705bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:23:23 +00:00
Bill Yi
510c5dcf82 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b877f7d946 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I06093abc3a9c7908ffdb60b7f2bca1562d1394ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 01:23:11 +00:00