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:58 +0000 (23:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 26 Jun 2017 23:31:58 +0000 (23:31 +0000)
am: 9f607f4c0b

Change-Id: Idd94f2e79bc1cad94995a88e647823870dcb0cee


Trivial merge