tree a01b09fe57776567a4faa931eff130a90a574943
parent fa44a6714e24fc4023120e9e96ce8144c3de7387
parent 87ce35c3710821eb57accef14e3ba5e3ca5cb324
author Kevin Hufnagle <khufnagle@google.com> 1513620106 +0000
committer android-build-merger <android-build-merger@google.com> 1513620106 +0000

Merge "docs: Revised wording, section order for ShortcutManager API ref." into oc-mr1-dev am: d642148c84
am: 87ce35c371

Change-Id: I0de0bea5712143e70f851f42fadaed0aa0eece64