Skip to content
Commit 8451e9a0 authored by Hongwei Wang's avatar Hongwei Wang
Browse files

[DO NOT MERGE][conflict] Merge "Disallow loading icon from content URI to...

[DO NOT MERGE][conflict] Merge "Disallow loading icon from content URI to PipMenu" into rvc-dev am: 5d31bd1c

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



Bug: 293475290
Change-Id: Ic50edc109c89378aacc926b5b56aa142f9a01bbb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b93914a7 5d31bd1c
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment