tree 4c329d8fc6a1928ad033fd4a521fb28e65c341fa
parent f4cf2434cc1da9db9b85e8c2c5431e3879bd0469
parent 7d2065df8a315a4def4b4c210f40b721f928ae4d
author Hongwei Wang <hwwang@google.com> 1690510558 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1690510558 +0000

[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 skip reason: subject contains skip directive

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

Change-Id: I53d3f83e5629830a695be460181c72943423c8d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>