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 am: 1098849828

Browse Source

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

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

...

This commit is contained in:

TreeHugger Robot

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

committed by Automerger Merge Worker

parent fe7ebdcafa 1098849828

commit 4d03403cd6

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