OSDN Git Service

Merge "Fix activity icon badging for non-bitmap icons" into oc-dev
authorMakoto Onuki <omakoto@google.com>
Mon, 26 Jun 2017 23:31:59 +0000 (23:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 26 Jun 2017 23:31:59 +0000 (23:31 +0000)
am: 9f607f4c0b

Change-Id: Ie8b426c14fa30b7c2f5eadc5818e1dfd16f8c0a5


Trivial merge