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:11:02 +0000 (20:11 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 5 May 2017 20:11:08 +0000 (20:11 +0000)

Trivial merge