OSDN Git Service

Merge "Show warning log when ShortcutInfo is re-published" into oc-dev
authorMakoto Onuki <omakoto@google.com>
Fri, 5 May 2017 20:16:49 +0000 (20:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 May 2017 20:16:49 +0000 (20:16 +0000)
am: 9ccb15a351

Change-Id: I7f246f362b6e8d124416db790e4856e52baa21b8


Trivial merge