| commit | b88b69143664571fb2d4ef2924d270d57894f62b | [log] [tgz] |
|---|---|---|
| author | Hongwei Wang <hwwang@google.com> | Fri Jul 28 18:12:28 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 28 18:12:28 2023 +0000 |
| tree | dc398751f76504a8364dda312174ec98a40b2db8 | |
| parent | 4215a509a8928ccce8a79259670e1924daac1969 [diff] | |
| parent | 6fc3dee28919ae5fa10c24a51d2bb769a670da8e [diff] |
[automerger skipped] [DO NOT MERGE][conflict] Merge "Disallow loading icon from content URI to PipMenu" into rvc-dev am: 5d31bd1c3b am: 8451e9a0c7 -s ours am: 5bc9e9288e -s ours am: fa10d780de -s ours am: 08dd2ef76b -s ours am: 7d2065df8a -s ours am: 6fc3dee289 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24228701 Change-Id: I0c36d98b77f883625944160467737c9423fc5e2a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>