summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author shaoweishen <shaoweishen@google.com> 2022-05-24 01:19:12 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-05-24 01:19:12 +0000
commitb046141cfa8e5c71580503d511cf54257d8b685f (patch)
treeb6f44feeab72c12a5a5ed470a23bb8ef4408a774 /libs/androidfw/AssetsProvider.cpp
parent7e3f2d3e7bb80e85a085cb499a6acdebfd91038d (diff)
parentd6f4576179bf0f3ed9ecfc31a796428f65a0f1cb (diff)
DO NOT MERGE: Downbranch merge conflict [Output Switcher] Fix situation when icon is not available for getBitmap am: 17d674584b am: d6f4576179
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18492582 Change-Id: Ifc579060c62f2615639dde052f0a5d74468996fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions