| commit | 5bc9e9288e7f1b93ab90ebc28ef65f56d677cbe1 | [log] [tgz] |
|---|---|---|
| author | Hongwei Wang <hwwang@google.com> | Thu Jul 27 22:14:17 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 27 22:14:17 2023 +0000 |
| tree | 88e0823f0005948ff8f1e151d95fbdf1fe9f5176 | |
| parent | 1f2e080f1b99cd2162f6cb756fd4694fddb05882 [diff] | |
| parent | 8451e9a0c7d37fb40ae6ff0b024381a802677b1a [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24228701 Change-Id: Ic85e6bd1ebd14234f9bf3b37f39248d584e44ebc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>