diff options
| author | 2023-07-28 18:51:01 +0000 | |
|---|---|---|
| committer | 2023-07-28 18:51:01 +0000 | |
| commit | 83dfa555ba4fae1d22ab534af4743555b1b771c0 (patch) | |
| tree | 9f734c0072d66606edb3390052487f44b8d3b02c /libs/androidfw/ApkParsing.cpp | |
| parent | ba53b063a6aaddccf66652b43d7a9c73125e1d2d (diff) | |
| parent | d5e886a7ea34f597a0705fe3c8700febb98c7fc4 (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: d5e886a7ea -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24228701
Change-Id: I2aadb372d9a745fd8d54d4f4e910bffead6a3b01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions