diff options
| author | 2023-07-27 23:44:22 +0000 | |
|---|---|---|
| committer | 2023-07-27 23:44:22 +0000 | |
| commit | 08dd2ef76bc5137e64c8e8ba19e6c8ea12d3d102 (patch) | |
| tree | 884bc229e9a34d6383f652966520f722aa621dbc /libs/androidfw/ConfigDescription.cpp | |
| parent | 31262f43e4f6d82f2fcc1198a7f54b5b43e597c0 (diff) | |
| parent | fa10d780de516c552e2f708d112f862df319f4be (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24228701
Change-Id: I67a6b82beb8a839f99fddc501ef256044cfcd779
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions