OSDN Git Service

Merge \"QS: Fix default icon handling for services\" into nyc-dev
authorJason Monk <jmonk@google.com>
Wed, 22 Jun 2016 15:44:06 +0000 (15:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 15:44:06 +0000 (15:44 +0000)
am: 94a20367b5

Change-Id: I20510a1397c304695596e4e8315d3cb428d26a74


Trivial merge