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)
am: a9c185f6e7

Change-Id: If571669aaa81d085774c1bb9a0daa308f237978a


Trivial merge