diff options
| author | 2023-07-28 18:28:19 +0000 | |
|---|---|---|
| committer | 2023-07-28 18:28:19 +0000 | |
| commit | d5e886a7ea34f597a0705fe3c8700febb98c7fc4 (patch) | |
| tree | a6293ed2c9fb711fd817c9494f406ced0a7ff038 /libs/androidfw/StringPool.cpp | |
| parent | a085203adc8016f035d5f9d773fee56583639525 (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: Iee76f7a83e545a4983339680c87b26114c66d532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions