| commit | 7c153dac7f3e753e0b81a1b008dbb9310b2320a3 | [log] [tgz] |
|---|---|---|
| author | Hongwei Wang <hwwang@google.com> | Fri Jul 28 08:19:48 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 28 08:19:48 2023 +0000 |
| tree | ed35e31a46b69c3f83cf648b2c47d0591b35812f | |
| parent | 685cf6d80e4e510323b3fb5190a556d85607c7d9 [diff] | |
| parent | 5fb26cd6bcd92a2d211f0a2149f9d8c6f96490da [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: 5904480a8a -s ours am: d47040b736 -s ours am: 5fb26cd6bc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24228701 Change-Id: If80100d65f7418ef20192a078cd83ad90bdad546 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>