Chiachang Wang
|
5aee139d18
|
[automerger skipped] [automerge] Stop using invalid URL to prevent unexpected crash 2p: fe57c5bf89 am: fd8519c2cd -s ours am: eb0e534173 -s ours am: e56393ed8a -s ours am: 331301463a -s ours
am skip reason: Merged-In I22903414380b62051f514e43b93af992f45740b4 with SHA-1 fe57c5bf89 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18714947
Change-Id: Ic061c676526a03ffa4f03299d8bd81c438de3d01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:05:58 +00:00 |
|
TreeHugger Robot
|
732dae74f0
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 336b7b204f -s ours am: 5ea8ceeff7 -s ours am: 546a8857a1 -s ours am: 39c18af96c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18777427
Change-Id: Ib731ef9c13e5339cfe6d4d13e811753b40337215
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:04:44 +00:00 |
|
Bill Yi
|
e810c526fe
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d63def2c8 -s ours am: 59aecdb8c1 -s ours am: ad0cf60a4a -s ours am: 38d1e7fe9b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18777427
Change-Id: Ied1246c357043d1ddf6d7264d4fd293306d06e31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:04:41 +00:00 |
|
TreeHugger Robot
|
fb4124317d
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: f4b6cf3a11 -s ours am: e35cb29504 -s ours am: fda70dee8d -s ours am: 578d302a65 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18776072
Change-Id: Ia1fd708689c191a1bf85deb95ff7a1a2fb419107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:04:37 +00:00 |
|
Bill Yi
|
d5d3f1d886
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 667bdf8806 -s ours am: 9ede26a6ff -s ours am: 13fb6d5fe4 -s ours am: fed9f14f39 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18776072
Change-Id: I1f6a41c3b9fd70b1392bd51406f4bf53bbdffea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:04:35 +00:00 |
|
TreeHugger Robot
|
eef4415093
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: bcb35fe69f -s ours am: b493e0da4f -s ours am: 88d58a0dae -s ours am: 66b2a3ee0f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18775542
Change-Id: I4b197294c9a64856353c4d88506aa76e770c44b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:04:20 +00:00 |
|
Bill Yi
|
976b865440
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 95bb0f5ce7 -s ours am: 243e62449a -s ours am: f73d9425cf -s ours am: 89e5e823bf -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18775542
Change-Id: Id99a0d9b8789aa249257d21ddffe99d152869fc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:04:18 +00:00 |
|
TreeHugger Robot
|
f1679934ab
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: fc45986d44 -s ours am: 9d6ff6fbf0 -s ours am: 53611ecf5d -s ours am: 443c4f67f3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18773990
Change-Id: I9e67f95d5dbbb94d7159e344d0e6130b8e7a3a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:04:09 +00:00 |
|
Bill Yi
|
b177012cae
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04d0b4ce64 -s ours am: fdca804d56 -s ours am: 4b0ea5e9b4 -s ours am: eff831a953 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18773990
Change-Id: I60c882d6cb0edd0adde3c6a3c482948c64b6a104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:04:05 +00:00 |
|
TreeHugger Robot
|
91c6eb08a3
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e903aeb450 -s ours am: dbbd8e8a02 -s ours am: 5322a429dc -s ours am: 333ec748c3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18773840
Change-Id: I7298508a5743bdfd75d3d14794c0dda4af2aa1e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:03:46 +00:00 |
|
Bill Yi
|
f3b08be7dc
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e74d61c7a1 -s ours am: 4f1744d758 -s ours am: 546fe09dda -s ours am: 1c377cdadd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18773840
Change-Id: I7a889e310054024fd03dfb203741e97350f9b82d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:03:25 +00:00 |
|
TreeHugger Robot
|
94b03c06f3
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 0992057b97 -s ours am: 0e23ce5a28 -s ours am: 16f5c4448b -s ours am: c7960f3ec3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986836
Change-Id: I355d75b4ed5108732138a360c37612820cd956b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:01:43 +00:00 |
|
Bill Yi
|
1327316fba
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c191aa247 -s ours am: b1ae0755c5 -s ours am: 6c0b793353 -s ours am: f26adbab30 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986836
Change-Id: I73d2ea376747b02e420ee9ac41234f1f8c8579c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:01:38 +00:00 |
|
TreeHugger Robot
|
d6e694e8eb
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8e33294989 -s ours am: cfcbe77943 -s ours am: 8cda91cffa -s ours am: 27f966c179 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986578
Change-Id: I79d8924cf1023ea01313fa1f8ad9cc838f8fbb9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:01:34 +00:00 |
|
Bill Yi
|
07ebad16f7
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f4ea53da1 -s ours am: 0819a913c2 -s ours am: 8d2904a798 -s ours am: 4226b76d9d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986578
Change-Id: I8a4f4417a558ed328051a9c59736d4e4a37f7e85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:01:28 +00:00 |
|
TreeHugger Robot
|
bf8662c7c6
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: adfc359191 -s ours am: 551baa2ab9 -s ours am: 3b88f078d5 -s ours am: b6fe1e7009 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986221
Change-Id: I72101a8ec0cad4df0f80ccf0cd208e59fb863613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:01:05 +00:00 |
|
Bill Yi
|
74c23a77bf
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8b7d27c75c -s ours am: b4f3a4a80b -s ours am: 814e539414 -s ours am: 8c84c1e182 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986221
Change-Id: I84720b02fd0a428bebf2d6fb4f0b9cad0cce408a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:01:02 +00:00 |
|
TreeHugger Robot
|
327af78599
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 48b8f07f59 -s ours am: 6438a031cf -s ours am: 7a05219d30 -s ours am: db1a244323 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986211
Change-Id: I98d2ec77789bd8b0ba383472882e0c287cf4f0e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:00:40 +00:00 |
|
Bill Yi
|
1c8e5828d5
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 191db2e5ee -s ours am: 8a6c10f061 -s ours am: 51c11f30d5 -s ours am: 973d5babe9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986211
Change-Id: I9b58b9778a8154f4ec41bed36c7e137a80bd2038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:00:32 +00:00 |
|
TreeHugger Robot
|
089ad83970
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9677eea827 -s ours am: 40bf1f0624 -s ours am: e379c62d27 -s ours am: ba50d02f3a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986139
Change-Id: I5a719082173a06cf82b709b02a90d2ac218007bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:00:28 +00:00 |
|
Bill Yi
|
70f56c4cf1
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 40e457d36b -s ours am: 4f04b6b819 -s ours am: 645595961f -s ours am: a7bead2801 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986139
Change-Id: Ie496a729da574db68e913f34fdd63f9c347dbf61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 03:00:00 +00:00 |
|
TreeHugger Robot
|
31d38b43f5
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 6a28f160f8 -s ours am: e0302c6bc3 -s ours am: a92445b594 -s ours am: ea6650093f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18984539
Change-Id: I0dee0beefd3577254ca5a8a24aa8298bc4a4a760
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:59:56 +00:00 |
|
Bill Yi
|
fec90e935e
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 83d48691a9 -s ours am: d2709dc485 -s ours am: d3590691fd -s ours am: ee523c0478 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18984539
Change-Id: Ia8637e18fdca1f11cd190af3855a1ea7e30d397b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:59:52 +00:00 |
|
TreeHugger Robot
|
ddea63fe36
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 3dbccb9a62 -s ours am: d5ae7eb7ab -s ours am: f08ede23bc -s ours am: cb5ea2b441 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18984249
Change-Id: I51c415341cf40a0e4e55176bab7d11d32e7eccfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:59:29 +00:00 |
|
Bill Yi
|
193d1e227d
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bba55fd8c9 -s ours am: 95780cab2c -s ours am: 7739fa2cf7 -s ours am: bee738c109 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18984249
Change-Id: Iafe41e80b08db9fc5174b301b2bc8fc4a0c6e52a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:59:01 +00:00 |
|
Bill Yi
|
f45cfac10e
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 306821690f -s ours am: c80806a181 -s ours am: eb92305598 -s ours am: b5f66a872f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18982564
Change-Id: I5aece0b3b03144fd585015360106df5c93a766ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:58:39 +00:00 |
|
Kenneth Ford
|
06bcf03aa7
|
Ignore tests in RecoverableKeyStoreManagerTest am: 4220de4d5b am: a4924eb85c am: 3a2171f668 am: e813a20711 am: 1554a00af4 am: 393f58bfde am: 3f89dfc901 am: bfc5e7dd0a am: e6464391f2 am: 8347fe3cff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18720703
Change-Id: I569ffad281423d9c1b599b1208746a0d8788f6cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:57:25 +00:00 |
|
TreeHugger Robot
|
60bbb95410
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 2b1450ac6d -s ours am: 4950617eb1 -s ours am: 335f499b33 -s ours am: 70f84fe624 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18857933
Change-Id: Ic9d59ac460592278918a2a28257e59ceb79ec711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:56:05 +00:00 |
|
Bill Yi
|
384f9a475d
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4cfebbcc91 -s ours am: 640e7481f0 -s ours am: bb7890fe29 -s ours am: 4c7676ca66 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18857933
Change-Id: I934d3d50d47358128d113ee0c86a4fd8ec804cb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:56:00 +00:00 |
|
TreeHugger Robot
|
ffc77e1e5d
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: fb7f47329a -s ours am: 4bbf3e6385 -s ours am: 98c4989296 -s ours am: 9de4e714a2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18851149
Change-Id: Ia101d4d9ac8efaa6ed9fdcb4a378836f88b2cb7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:55:57 +00:00 |
|
Bill Yi
|
8b1fb9f5e9
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc505ab9ea -s ours am: 6273a44e43 -s ours am: 04dd0d404e -s ours am: 0592d8f7ce -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18851149
Change-Id: I2c98a9683fa83177ccacc97179f4f3618b30644c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:55:27 +00:00 |
|
Bill Yi
|
327791ebc9
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1e83150e37 -s ours am: 468116cf1e -s ours am: ac0b3c6901 -s ours am: cef013177a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18848863
Change-Id: I71d339d8c038f1e137af5d0156ca9c256003bcbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:55:13 +00:00 |
|
Makoto Onuki
|
42ad7c785f
|
Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5b0 am: 822fbf618b am: ea69ad5892 am: f15b3c2553 am: 6a68d207f0 am: 1ead5bc341 am: a637f955c1 am: 6934453a73 am: a15b223884
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369
Change-Id: I10a80034562e48a01b7284df6220ce68f1566801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:54:01 +00:00 |
|
Adrian Roos
|
109cd69b6d
|
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours am: 7a57d77f94 -s ours am: ba943db1e3 -s ours am: c8ba614846 -s ours am: c7ce7f3913 -s ours am: 0566875dda -s ours am: 9c927c785e -s ours am: 05d01e344d -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 fd7847b533 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18489968
Change-Id: Id9eba47d7989099f67f77951017923b035502fa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:53:43 +00:00 |
|
Adrian Roos
|
6c7d81e08f
|
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev am: 31e8959439 am: a89cdcefab -s ours am: b55f60342e -s ours am: 0a7110f491 -s ours am: 94d96c078c -s ours am: f675c713c2 -s ours am: 969cf8e29a -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18492305
Change-Id: Ib58265daea41c8bcdf07b3cbfbbdbea61169ce61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:53:26 +00:00 |
|
Adrian Roos
|
b983399a0e
|
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into sc-dev am: 4bc778ea49 -s ours am: aac1f74397 -s ours am: 282045b925 -s ours am: 88d00c1fa1 -s ours am: 97b191f18f -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16940229
Change-Id: I6c4c8f8f1b389727ad5c1611545865bf055a5df1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:53:10 +00:00 |
|
Adrian Roos
|
ac092850c0
|
[automerger skipped] Merge changes from topic "b204906124-sc" into sc-mainline-prod am: bc73d79caf -s ours am: 31954b8283 -s ours am: 5b219d178f -s ours am: bd4a34c9dd -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 2ab01736a6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16940229
Change-Id: Ie4a11c0e4a6b47fba88414c853d7ec8e1ac9125c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:52:38 +00:00 |
|
Adrian Roos
|
eb110b33b5
|
[automerger skipped] [automerge] Restrict getInputMethodWindowVisibleHeight 2p: 753331b390 am: 48ceafeb96 -s ours am: 5cedd5ef73 -s ours am: d3698ec296 -s ours am: b683ef24e3 -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 2ab01736a6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16940229
Change-Id: I1638fdf818192d4bc031445b11ad4725c00fd300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:52:34 +00:00 |
|
Chiachang Wang
|
a525fd0275
|
[automerger skipped] Merge "Stop using invalid URL to prevent unexpected crash" into qt-dev am: 3ac8d1dc2f am: dadbab8ae8 am: 14f1bec4c2 am: 96f4ca0fbf -s ours am: 13d9983159 -s ours am: 0558135223 -s ours am: 76e31b13c2 -s ours am: 0cfe0dad86 -s ours am: 8233080313 -s ours
am skip reason: Merged-In I22903414380b62051f514e43b93af992f45740b4 with SHA-1 fe57c5bf89 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715266
Change-Id: I8e32e5bc3f7fe6497f32a85317bd990f7da4d8fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:50:50 +00:00 |
|
Chiachang Wang
|
831f4d74f3
|
[automerger skipped] Merge "Stop using invalid URL to prevent unexpected crash" into sc-dev am: bc162dd714 -s ours am: 47ea8c50b5 -s ours am: b72eb3dc80 -s ours am: ed8c9892b7 -s ours am: cc6abed66e -s ours
am skip reason: Merged-In I22903414380b62051f514e43b93af992f45740b4 with SHA-1 fe57c5bf89 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18714947
Change-Id: Id7ef9e1cfab1c76fc53d1d36bb347dbd999e854d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:50:37 +00:00 |
|
Chiachang Wang
|
1b5e656dae
|
[automerger skipped] Merge changes from topic "cherrypicker-L08900000954891083:N79200001270491487" into sc-mainline-prod am: a55c76e20d -s ours am: d40f030a35 -s ours am: 21e8270df1 -s ours am: 544a07264f -s ours
am skip reason: Merged-In I22903414380b62051f514e43b93af992f45740b4 with SHA-1 fe57c5bf89 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18714947
Change-Id: Ie9ae8cfb4cb464b57a939923dbcc8698991f6c20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:50:23 +00:00 |
|
Chiachang Wang
|
6cec1664f9
|
[automerger skipped] [automerge] Stop using invalid URL to prevent unexpected crash 2p: fe57c5bf89 am: fd8519c2cd -s ours am: eb0e534173 -s ours am: 423d42d0fa -s ours am: 07a4bd5cd4 -s ours
am skip reason: Merged-In I22903414380b62051f514e43b93af992f45740b4 with SHA-1 fe57c5bf89 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18714947
Change-Id: I8fc0b1bf301aac7d9e729d3296edcf54700c1f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:50:19 +00:00 |
|
TreeHugger Robot
|
9b92575628
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 336b7b204f -s ours am: 5ea8ceeff7 -s ours am: 14f3085b92 -s ours am: 36fae00134 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18777427
Change-Id: Ice0f7dd41873dbf537be1a69396a50e7eceb930b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:49:04 +00:00 |
|
Bill Yi
|
405c44ef7a
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d63def2c8 -s ours am: 59aecdb8c1 -s ours am: 3c725c0b90 -s ours am: 95c7fd26d7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18777427
Change-Id: I9bb1ac48a19aa6277e6ff30ac20ad1f3775bc5b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:48:40 +00:00 |
|
TreeHugger Robot
|
d739b04b2c
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: f4b6cf3a11 -s ours am: e35cb29504 -s ours am: 9c2fdb0143 -s ours am: 0b9867823c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18776072
Change-Id: Ic1df16e12a2b2b828fde30bca563ff6f1b7651c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:48:29 +00:00 |
|
Bill Yi
|
a05c2d6530
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 667bdf8806 -s ours am: 9ede26a6ff -s ours am: 8ded93c488 -s ours am: 7a4dfa0240 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18776072
Change-Id: I8e1b0797e88ca184b5ecaa601fa514311aac867e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:48:26 +00:00 |
|
TreeHugger Robot
|
b0b3a329a8
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: bcb35fe69f -s ours am: b493e0da4f -s ours am: 6d05907db4 -s ours am: c471723815 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18775542
Change-Id: I0cb1320eecc5ddbb068926a3c53025f2050105a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:48:23 +00:00 |
|
Bill Yi
|
32a70f7497
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 95bb0f5ce7 -s ours am: 243e62449a -s ours am: 961a187758 -s ours am: 59b15584a0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18775542
Change-Id: I0272e539bf089a604aecdd548af4807756eb13c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:48:15 +00:00 |
|
TreeHugger Robot
|
b6db3850df
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: fc45986d44 -s ours am: 9d6ff6fbf0 -s ours am: b760300527 -s ours am: 6ae4c2b3bc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18773990
Change-Id: Ie1018a8626f0c869ea842edac238a61b26f330de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:48:10 +00:00 |
|
Bill Yi
|
0b2a83e751
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04d0b4ce64 -s ours am: fdca804d56 -s ours am: b320ba37e1 -s ours am: 8383d4c6ee -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18773990
Change-Id: Ia9d242eb5a7edf39691c65942d1c8d0b8c454ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-24 02:48:06 +00:00 |
|