diff options
| author | 2023-07-28 13:28:54 +0000 | |
|---|---|---|
| committer | 2023-07-28 13:28:54 +0000 | |
| commit | e652bb0c3fc1f985d0d365715e628a582e7917a1 (patch) | |
| tree | d33bdd78f43afc1ffc243c1ee5e31527941a7ce0 /libs/androidfw/FileStream.cpp | |
| parent | fc3d4ecaf06df73a93a9ebf36989af6baaa2de02 (diff) | |
| parent | 99115be5df1956ea26efc7422b9d73db051c092f (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: 99115be5df -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24228701
Change-Id: Ied143ab1f8d88edb03736dc3acaac4dfcbdc2179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions