tree d59bd3a6d58464fb2fb6fb945d6907c9fbb6bd65
parent be25fc4240c70d9ece53493f3bba717ee19daedc
parent cff0fad96cd888d42f4542cd08d69a0b78ee09e0
author Kevin Hufnagle <khufnagle@google.com> 1502931184 +0000
committer android-build-merger <android-build-merger@google.com> 1502931184 +0000

Merge "Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5 am: b9db19de6a am: 0df906d279" into oc-mr1-dev-plus-aosp
am: cff0fad96c

Change-Id: I08c3da5917c9035390235845280982d3df9d4cb1