OSDN Git Service

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

Change-Id: Idba763e56af1fa6e76ddbb3d8880f7eb78c944f3