tree d59bd3a6d58464fb2fb6fb945d6907c9fbb6bd65
parent e714ef339697debdddad286a96cc6018bc181710
parent 3de8e434c243ddb1e56773ba368ef99bc4017ef1
author Kevin Hufnagle <khufnagle@google.com> 1502931460 +0000
committer android-build-merger <android-build-merger@google.com> 1502931460 +0000

Merge "Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5 am: d6d6d2cf79" into oc-dr1-dev-plus-aosp am: 7d0dcbb13d
am: 3de8e434c2

Change-Id: I34b3cb4d0872ea06cd0ada7809d2502c3e4b2205