diff options
| author | 2023-07-28 18:51:25 +0000 | |
|---|---|---|
| committer | 2023-07-28 18:51:25 +0000 | |
| commit | c88b43c5b3eae05ce8bab833e0e406ed66fae0d4 (patch) | |
| tree | 82d29a0c8252d7f4269732e86de53249f6a733a5 /libs/androidfw/FileStream.cpp | |
| parent | c2a3cd7e11ea875d0a734ed7cbfc4a2567c3c296 (diff) | |
| parent | 197708eef0eb127d968dd3e436ee1166881554ad (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: 6fc3dee289 -s ours am: b88b691436 -s ours am: 197708eef0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24228701
Change-Id: Ifdf0a6fd23b8cf604e900025fd2825b22674a612
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