OSDN Git Service

Merge "docs: Updated ShortcutManager and ShortcutInfo class references." into nyc...
authorKevin Hufnagle <khufnagle@google.com>
Wed, 19 Oct 2016 23:53:40 +0000 (23:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Oct 2016 23:53:40 +0000 (23:53 +0000)
am: fee89015c5

Change-Id: Ieeb9f7424d8f8e7845417f069b044e50b95c693f


Trivial merge