Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Fix situation when icon is not available for getBitmap" into tm-dev am: d0225df023 am: 3cfcba7c50

Browse Source

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

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

...

This commit is contained in:

TreeHugger Robot

2022-05-24 04:02:32 +00:00

committed by Automerger Merge Worker

parent 3c0cadff22 3cfcba7c50

commit 27d5f19c64

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