Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 10988498 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Fix situation... 

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

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



Change-Id: I8640bc66874222ad9abda818e7d93eaf4759eb7f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b046141c 9eca9d7d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment