OSDN Git Service

Merge "Merge "Fix activity icon badging for non-bitmap icons" into oc-dev am: 9f607f4...
authorMakoto Onuki <omakoto@google.com>
Tue, 27 Jun 2017 00:36:56 +0000 (00:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Jun 2017 00:36:56 +0000 (00:36 +0000)
am: bd1d8bf4c2

Change-Id: I770e8c209a9885685c1415cbb4a3c6a2ccb37e44


Trivial merge