Merge changes from topic "am-599cbaad1a6e4dbea89840bd93cf8505" into tm-qpr-dev-plus-aosp
* changes: Merge changes from topic "am-d860aeb1f4184ec4b358c442e876df1c" into tm-dev-plus-aosp am:ffab94b651am:e1224ca460Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Fix situation when icon is not available for getBitmap" into tm-dev am:d0225df023am:3cfcba7c50am:27d5f19c64
This commit is contained in:
committed by
Android (Google) Code Review
commit
a259c3e338