OSDN Git Service

Merge \"Fix updateShortcuts() with icons\" into nyc-mr1-dev
authorMakoto Onuki <omakoto@google.com>
Thu, 30 Jun 2016 00:04:25 +0000 (00:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Jun 2016 00:04:25 +0000 (00:04 +0000)
am: bc8e0052fd

Change-Id: I009387abcbb24e3051611eee708fedd86f1b9dcd


Trivial merge