summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author shaoweishen <shaoweishen@google.com> 2022-05-24 00:55:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-05-24 00:55:33 +0000
commitd6f4576179bf0f3ed9ecfc31a796428f65a0f1cb (patch)
tree4464e663e6be4234fb2f637448b9167c800af70c /libs/androidfw/AssetsProvider.cpp
parent5f252358953bb3ca908d1b37926d4349f0200a4e (diff)
parent17d674584bc487e79707a2c104ad15b3c1c9f218 (diff)
DO NOT MERGE: Downbranch merge conflict [Output Switcher] Fix situation when icon is not available for getBitmap am: 17d674584b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18492582 Change-Id: Ifa27c545e66cd450d4fc7d11fd9fddbdb32f98bd 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