DO NOT MERGE: Downbranch merge conflict [Output Switcher] Fix situation when icon is not available for getBitmap am: 17d674584b am: d6f4576179 am: b046141cfa

Browse Source

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18492582

Change-Id: Ib1cc237675a4eefece99845eba300e2f8394b630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

shaoweishen

2022-05-24 03:55:05 +00:00

committed by Automerger Merge Worker

parent a4bb538b21 b046141cfa

commit fe7ebdcafa

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available