Commit Graph

756391 Commits

Author SHA1 Message Date
JW Wang
ff8a5cc643 [automerger skipped] Fix NPE am: f562aadd77 -s ours am: 364c623d36 -s ours am: 6a35ac1222 -s ours am: d10fda2b4d -s ours am: f6c384ae85 -s ours am: 95c8cc5e77 -s ours am: fe89d5f644 -s ours am: 277a8cfc1d -s ours am: 896c2e0264 -s ours
am skip reason: skipped by user schfan

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

Change-Id: Id9814566ceeae9ba5a496cfc514c1ab6982d6fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 04:10:45 +00:00
Treehugger Robot
352e62a3d8 Merge "Remove unused empty filegroups from frameworks/base." am: 5ee9c55130 am: 76e9b955c5 am: 735d0192f6 am: 36b1820a69
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2026205

Change-Id: I1af3712be4e16f7405751ed81c71ff7e10946306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 04:10:39 +00:00
JW Wang
896c2e0264 [automerger skipped] Fix NPE am: f562aadd77 -s ours am: 364c623d36 -s ours am: 6a35ac1222 -s ours am: d10fda2b4d -s ours am: f6c384ae85 -s ours am: 95c8cc5e77 -s ours am: fe89d5f644 -s ours am: 277a8cfc1d -s ours
am skip reason: skipped by user schfan

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

Change-Id: I98524b450e614f31401e4c0b822cd8480aa3a275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 03:46:15 +00:00
Treehugger Robot
36b1820a69 Merge "Remove unused empty filegroups from frameworks/base." am: 5ee9c55130 am: 76e9b955c5 am: 735d0192f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2026205

Change-Id: I044909e335b0b1786f8248c3d8d865eda75e6705
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 03:45:34 +00:00
JW Wang
f98d6a7dba [automerger skipped] Fix NPE am: f562aadd77 -s ours am: 364c623d36 -s ours am: 6a35ac1222 -s ours am: d10fda2b4d -s ours am: f6c384ae85 -s ours am: 2a711e9a34 -s ours am: 66a3bca939 -s ours
am skip reason: skipped by user schfan

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

Change-Id: I2a4beeb780f620f8115bde54fd3acafb0abfd843
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 03:26:39 +00:00
JW Wang
277a8cfc1d [automerger skipped] Fix NPE am: f562aadd77 -s ours am: 364c623d36 -s ours am: 6a35ac1222 -s ours am: d10fda2b4d -s ours am: f6c384ae85 -s ours am: 95c8cc5e77 -s ours am: fe89d5f644 -s ours
am skip reason: skipped by user schfan

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

Change-Id: I63b1987c135143efa20f9892d5a42f80df8da2d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 03:25:10 +00:00
Treehugger Robot
735d0192f6 Merge "Remove unused empty filegroups from frameworks/base." am: 5ee9c55130 am: 76e9b955c5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2026205

Change-Id: I05cee707356617d266232562ced01fe776c9e09d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 03:20:51 +00:00
JW Wang
fe89d5f644 [automerger skipped] Fix NPE am: f562aadd77 -s ours am: 364c623d36 -s ours am: 6a35ac1222 -s ours am: d10fda2b4d -s ours am: f6c384ae85 -s ours am: 95c8cc5e77 -s ours
am skip reason: skipped by user schfan

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

Change-Id: I856640caf595bf6a6a5376a7a13b688e55b690b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 02:59:44 +00:00
JW Wang
66a3bca939 [automerger skipped] Fix NPE am: f562aadd77 -s ours am: 364c623d36 -s ours am: 6a35ac1222 -s ours am: d10fda2b4d -s ours am: f6c384ae85 -s ours am: 2a711e9a34 -s ours
am skip reason: skipped by user schfan

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

Change-Id: I10270b4cccbb992c824e739beda6bc213bc8f335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 02:59:42 +00:00
Treehugger Robot
76e9b955c5 Merge "Remove unused empty filegroups from frameworks/base." am: 5ee9c55130
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2026205

Change-Id: I396960d537ab1f9bcbdcee7eebcc20fb35f4d981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 02:45:09 +00:00
JW Wang
95c8cc5e77 [automerger skipped] Fix NPE am: f562aadd77 -s ours am: 364c623d36 -s ours am: 6a35ac1222 -s ours am: d10fda2b4d -s ours am: f6c384ae85 -s ours
am skip reason: skipped by user schfan

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

Change-Id: I9264b4354c1441edb495d9059e24a4551ba68e01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 02:38:43 +00:00
JW Wang
2a711e9a34 [automerger skipped] Fix NPE am: f562aadd77 -s ours am: 364c623d36 -s ours am: 6a35ac1222 -s ours am: d10fda2b4d -s ours am: f6c384ae85 -s ours
am skip reason: skipped by user schfan

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

Change-Id: I2272d42b611197ae6946d886b4807bc5faf8bc42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 02:37:47 +00:00
Treehugger Robot
5ee9c55130 Merge "Remove unused empty filegroups from frameworks/base." 2022-04-06 02:27:54 +00:00
JW Wang
e403f38a97 [automerger skipped] Fix NPE am: e58049a3ea -s ours am: 651840fc64 -s ours am: 9a793e0b65 -s ours am: 570bf6b1db -s ours am: e1d0d4754f -s ours am: 3ec8a826bc -s ours am: 3f8cf149b1 -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 a3e2e68fd0 is already in history

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

Change-Id: Ia06e11b9b74f7cd150a236a4f7016e975fa86d4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 02:13:28 +00:00
JW Wang
b21a30d785 [automerger skipped] Fix NPE am: a3e2e68fd0 am: 2f86e541d9 -s ours am: 9b3f3125ab -s ours am: 0b2b4ab5d9 -s ours am: 42a5e49c37 -s ours am: a1e1797158 -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 d5e46da66a is already in history

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

Change-Id: I094b36ba4953e74259837f4557882eb21cce7e21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 02:13:13 +00:00
JW Wang
f6c384ae85 [automerger skipped] Fix NPE am: f562aadd77 -s ours am: 364c623d36 -s ours am: 6a35ac1222 -s ours am: d10fda2b4d -s ours
am skip reason: skipped by user schfan

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

Change-Id: Id86dae9131e2743a12adc54c46a1e23046c9de63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 02:12:14 +00:00
JW Wang
3f8cf149b1 [automerger skipped] Fix NPE am: e58049a3ea -s ours am: 651840fc64 -s ours am: 9a793e0b65 -s ours am: 570bf6b1db -s ours am: e1d0d4754f -s ours am: 3ec8a826bc -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 a3e2e68fd0 is already in history

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

Change-Id: I6fe891ec2936f79766f3fc8c350f613d8ae19a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 01:51:21 +00:00
JW Wang
a1e1797158 [automerger skipped] Fix NPE am: a3e2e68fd0 am: 2f86e541d9 -s ours am: 9b3f3125ab -s ours am: 0b2b4ab5d9 -s ours am: 42a5e49c37 -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 d5e46da66a is already in history

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

Change-Id: Ib6f87e95030d8397b2f292f1e9066b84d8ea2b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 01:50:54 +00:00
JW Wang
d10fda2b4d [automerger skipped] Fix NPE am: f562aadd77 -s ours am: 364c623d36 -s ours am: 6a35ac1222 -s ours
am skip reason: skipped by user schfan

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

Change-Id: Ibfe819cfb2547213a228b291f3e91ed261a73b36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 01:50:38 +00:00
Songchun Fan
359a980a2f [automerger skipped] Merge "Fix NPE" into sc-v2-dev am: f56a9bd2d0 -s ours am: 3be41a17bd -s ours am: 4ec484f8d7 -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 18179a8762 is already in history

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

Change-Id: If9a1326698e71f7dd357d4d6546d62954d130e55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 01:21:35 +00:00
TreeHugger Robot
ea49fa9c61 [automerger skipped] Merge "Fix NPE" into sc-qpr1-dev am: f8e5b63d26 am: df4fd53f37 am: 1e02fd81cf -s ours am: 795899e624 -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 18179a8762 is already in history

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

Change-Id: I48c8fb64894058c7fc8839e3b8e796739094e3e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 01:21:28 +00:00
JW Wang
02b3257cd2 [automerger skipped] Fix NPE am: e58049a3ea -s ours am: 651840fc64 -s ours am: 9a793e0b65 -s ours am: 249799a0a7 -s ours am: ec0c0577c9 -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 a3e2e68fd0 is already in history

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

Change-Id: I3b024b140872c2bd2ccc29d5da6c2844435ed048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 01:21:20 +00:00
JW Wang
01ff35027a [automerger skipped] Fix NPE am: a3e2e68fd0 am: 2f86e541d9 am: 72a161f31e -s ours am: a639d4c343 -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 07e31dfb1e is already in history

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

Change-Id: Ia6b0226b5c9cfceed3a85ffc3b04e1619001a6da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 01:21:15 +00:00
Songchun Fan
ad5e51fd52 [automerger skipped] Merge changes from topic "presubmit-am-b5e39839c1434267a07590be6e0b1b91" into sc-v2-dev-plus-aosp am: e70eb23c26 -s ours am: ce79e0a2f1 -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 07e31dfb1e is already in history

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

Change-Id: I98fed0dfaa33b61993b5b5c829d0d3ccd1767ede
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 01:21:03 +00:00
Presubmit Automerger Backend
176523d832 [automerger skipped] [automerge] Fix NPE 2p: 18179a8762 am: 789aab93bd -s ours am: 4102d87f47 -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 07e31dfb1e is already in history

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

Change-Id: Iab8de392dee1c6f925767386a0253e73c04e756a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 01:21:01 +00:00
JW Wang
3ec8a826bc [automerger skipped] Fix NPE am: e58049a3ea -s ours am: 651840fc64 -s ours am: 9a793e0b65 -s ours am: 570bf6b1db -s ours am: e1d0d4754f -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 a3e2e68fd0 is already in history

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

Change-Id: I5eea95731e63af92407151297e87ed4e30c88b7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 01:19:35 +00:00
JW Wang
6a35ac1222 [automerger skipped] Fix NPE am: f562aadd77 -s ours am: 364c623d36 -s ours
am skip reason: skipped by user schfan

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

Change-Id: Ie699bdec11ef61d86a5069d3555795afa80d2461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 01:19:19 +00:00
JW Wang
42a5e49c37 [automerger skipped] Fix NPE am: a3e2e68fd0 am: 2f86e541d9 -s ours am: 9b3f3125ab -s ours am: 0b2b4ab5d9 -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 d5e46da66a is already in history

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

Change-Id: I3f2afaac23d71e81cbb78d57b3b8611d49bee405
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 01:19:10 +00:00
JW Wang
364c623d36 [automerger skipped] Fix NPE am: f562aadd77 -s ours
am skip reason: skipped by user schfan

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

Change-Id: I99d33204fb7de123971cdbe91b39e1b9c651e554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 01:04:40 +00:00
Songchun Fan
4ec484f8d7 [automerger skipped] Merge "Fix NPE" into sc-v2-dev am: f56a9bd2d0 -s ours am: 3be41a17bd -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 18179a8762 is already in history

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

Change-Id: I38da4e1aab765a4487d48f7e4837176b85e60b62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 01:00:28 +00:00
TreeHugger Robot
795899e624 [automerger skipped] Merge "Fix NPE" into sc-qpr1-dev am: f8e5b63d26 am: df4fd53f37 am: 1e02fd81cf -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 18179a8762 is already in history

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

Change-Id: Ide5fb348bb42242541c09e10cf55b48d4724f630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 00:59:46 +00:00
JW Wang
e1d0d4754f [automerger skipped] Fix NPE am: e58049a3ea -s ours am: 651840fc64 -s ours am: 9a793e0b65 -s ours am: 570bf6b1db -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 a3e2e68fd0 is already in history

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

Change-Id: I7be3db6254cce4a4db6a3748aafec035806a3c80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 00:59:09 +00:00
JW Wang
ec0c0577c9 [automerger skipped] Fix NPE am: e58049a3ea -s ours am: 651840fc64 -s ours am: 9a793e0b65 -s ours am: 249799a0a7 -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 a3e2e68fd0 is already in history

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

Change-Id: I962966109c87469f8900b7c8b7ef5a5df0a949f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 00:59:08 +00:00
JW Wang
a639d4c343 [automerger skipped] Fix NPE am: a3e2e68fd0 am: 2f86e541d9 am: 72a161f31e -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 07e31dfb1e is already in history

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

Change-Id: I1211bddc108439dd1c02fc22e0238fb1540cb34f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 00:58:53 +00:00
JW Wang
0b2b4ab5d9 [automerger skipped] Fix NPE am: a3e2e68fd0 am: 2f86e541d9 -s ours am: 9b3f3125ab -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 d5e46da66a is already in history

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

Change-Id: I43b981c2b1cd693be6b02a219360d169c811b5a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 00:58:52 +00:00
Songchun Fan
ce79e0a2f1 [automerger skipped] Merge changes from topic "presubmit-am-b5e39839c1434267a07590be6e0b1b91" into sc-v2-dev-plus-aosp am: e70eb23c26 -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 07e31dfb1e is already in history

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

Change-Id: I6c920eccc17eec4dcefe43b488765cc481492eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 00:58:32 +00:00
Presubmit Automerger Backend
4102d87f47 [automerger skipped] [automerge] Fix NPE 2p: 18179a8762 am: 789aab93bd -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 07e31dfb1e is already in history

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

Change-Id: If35cf24ca6cb24e939da54def1583096d86c44bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 00:58:15 +00:00
Haoyu Zhang
384c0c7552 Merge "Scribe: fix handwriting is not initiated in WebView" into tm-dev am: ef233d0fad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17464394

Change-Id: Ib4ea6ba5a07523c1038b5d537b7d459c27b83675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 00:45:18 +00:00
Songchun Fan
3be41a17bd [automerger skipped] Merge "Fix NPE" into sc-v2-dev am: f56a9bd2d0 -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 18179a8762 is already in history

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

Change-Id: I6f9d09e9146eac5c8cc75d22aef6ddacdc5362e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 00:43:47 +00:00
JW Wang
570bf6b1db [automerger skipped] Fix NPE am: e58049a3ea -s ours am: 651840fc64 -s ours am: 9a793e0b65 -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 a3e2e68fd0 is already in history

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

Change-Id: I9754d7d65c421579841f8e1bea949c7b69a8f6c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 00:36:48 +00:00
JW Wang
9b3f3125ab [automerger skipped] Fix NPE am: a3e2e68fd0 am: 2f86e541d9 -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 d5e46da66a is already in history

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

Change-Id: I5190f96ad0b29f090505bc349b1fc248a955de0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 00:36:41 +00:00
JW Wang
249799a0a7 [automerger skipped] Fix NPE am: e58049a3ea -s ours am: 651840fc64 -s ours am: 9a793e0b65 -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 a3e2e68fd0 is already in history

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

Change-Id: I39e6ecb7a6b6e68da35693774fa02aa031fa8748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 00:36:03 +00:00
JW Wang
72a161f31e Fix NPE am: a3e2e68fd0 am: 2f86e541d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591433

Change-Id: I59bc04ac4963cfb95fc8bdf669759624e4aaf4f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 00:35:53 +00:00
TreeHugger Robot
1e02fd81cf Merge "Fix NPE" into sc-qpr1-dev am: f8e5b63d26 am: df4fd53f37
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17592145

Change-Id: I54a5e4a4bda3d4bde92c2454e2dec8a986483314
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 00:35:13 +00:00
Songchun Fan
f56a9bd2d0 Merge "Fix NPE" into sc-v2-dev 2022-04-06 00:35:03 +00:00
Songchun Fan
e70eb23c26 Merge changes from topic "presubmit-am-b5e39839c1434267a07590be6e0b1b91" into sc-v2-dev-plus-aosp
* changes:
  [automerge] Fix NPE 2p: 18179a8762
  Fix NPE
2022-04-06 00:35:03 +00:00
Haoyu Zhang
ef233d0fad Merge "Scribe: fix handwriting is not initiated in WebView" into tm-dev 2022-04-06 00:18:12 +00:00
TreeHugger Robot
df4fd53f37 Merge "Fix NPE" into sc-qpr1-dev am: f8e5b63d26
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17592145

Change-Id: I719f8f01e809480fc857612f77aefd13c3c22ca5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 00:12:30 +00:00
JW Wang
9a793e0b65 [automerger skipped] Fix NPE am: e58049a3ea -s ours am: 651840fc64 -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 a3e2e68fd0 is already in history

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

Change-Id: I4aec93d1e4814610e7bcc7a340ec25f9c1c392a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 00:09:39 +00:00
JW Wang
2f86e541d9 Fix NPE am: a3e2e68fd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591433

Change-Id: Ia465094b84a788e0a3b824a4cdf787899149bb26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 00:09:13 +00:00