diff options
| author | 2023-07-28 18:29:21 +0000 | |
|---|---|---|
| committer | 2023-07-28 18:29:21 +0000 | |
| commit | 799a2274360060b9351785c2daac1a9e3343541f (patch) | |
| tree | c0069edbad3d61b1a38def838475e844d54b8de6 /libs/androidfw/FileStream.cpp | |
| parent | 4014d1062218f4e676bd104dcf1e9ca31f9af194 (diff) | |
| parent | b88b69143664571fb2d4ef2924d270d57894f62b (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24228701
Change-Id: Iaf536b2c685d9d8ffdfe6710a34e8f3d3dacc8ed
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