diff options
| author | 2023-07-28 10:54:46 +0000 | |
|---|---|---|
| committer | 2023-07-28 10:54:46 +0000 | |
| commit | 99115be5df1956ea26efc7422b9d73db051c092f (patch) | |
| tree | 050a0705f1c82854629f123dda60d6d9affa97d5 /libs/androidfw/FileStream.cpp | |
| parent | 92d3e036e2ac9645f65e510266dd762e2cc478af (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: I9e0f53a0f3c2ccd1c1504f39c3f0ab915a224b93
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