OSDN Git Service

Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev
authorMakoto Onuki <omakoto@google.com>
Tue, 6 Jun 2017 16:44:59 +0000 (16:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Jun 2017 16:44:59 +0000 (16:44 +0000)
commita178d194f9f8790a0bec2588b5990f40389b97a8
treeb8d7dcb49339530f924931cbe9cbd6dc2c388de6
parent67cb5f5210dd53d6e4726ab77bc5fc5164ab1a3c
parenta9c185f6e7df6e96fba540a9235ac1b26402bca1
Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev
am: a9c185f6e7

Change-Id: If571669aaa81d085774c1bb9a0daa308f237978a