diff options
| author | 2022-05-24 01:19:21 +0000 | |
|---|---|---|
| committer | 2022-05-24 01:19:21 +0000 | |
| commit | 1098849828f51e78f685a51c77a14bbae19bc4b4 (patch) | |
| tree | b6f44feeab72c12a5a5ed470a23bb8ef4408a774 /libs/androidfw/AssetsProvider.cpp | |
| parent | b046141cfa8e5c71580503d511cf54257d8b685f (diff) | |
| parent | 9eca9d7d0be7d9b353fa3b6be8afd4028c0ab671 (diff) | |
Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Fix situation when icon is not available for getBitmap" into tm-dev am: d0225df023 am: 9eca9d7d0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18492582
Change-Id: I8640bc66874222ad9abda818e7d93eaf4759eb7f
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