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

Browse Source

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

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

...

This commit is contained in:

TreeHugger Robot

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

committed by Automerger Merge Worker

parent d6f4576179 d0225df023

commit 9eca9d7d0b

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