summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Hongwei Wang <hwwang@google.com> 2023-07-26 23:01:28 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-26 23:01:28 +0000
commitaa0362b18f5e01591b004134d4ce5a1081d4e9d5 (patch)
treea018db12b8a87523c9d1780297581c16c2d7d47a /libs/androidfw/ConfigDescription.cpp
parentf5a4efb0a899093ef5388ed91d82c59b41c326b7 (diff)
parent9c653875b2bc384c42f698021fedc8f3c889ff81 (diff)
[automerger skipped] Merge "Disallow loading icon from content URI to PipMenu" into sc-dev am: 1f2e080f1b am: 0fbf93b9f6 am: 31262f43e4 -s ours am: 9c653875b2 -s ours
am skip reason: Merged-In Ib3f5b8b6b9ce644fdf1173548d9078e4d969ae2e with SHA-1 1aee65603e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23423703 Change-Id: I1c962fb5969e6cd8a62c1e6647c4ada500b08b3d 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