From: Kevin Hufnagle <khufnagle@google.com>
Date: Mon, 18 Dec 2017 17:52:36 +0000 (+0000)
Subject: Merge "docs: Revised wording, section order for ShortcutManager API ref." into oc... 
X-Git-Tag: android-x86-9.0-r1~288^2~9^2~6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=87ce35c371;p=android-x86%2Fframeworks-base.git

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

Change-Id: Iabb204baf3772b44b6852ec9d7135db0baf228bc
---

87ce35c3710821eb57accef14e3ba5e3ca5cb324