summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Hongwei Wang <hwwang@google.com> 2023-07-26 22:59:05 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-26 22:59:05 +0000
commit27fa09dcd12f2451ee571bb5a04227993a01cd14 (patch)
treebb91641ee48a5727d45abd6f8f61b14e6e4e9c80 /libs/androidfw/ConfigDescription.cpp
parenteef58f6f25fc8471180285e35cdfc932d5a9da99 (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: I94ca262e823f8a1716c9f8197a6724058255bb5e 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