am: 1d616f0
* commit '1d616f0d880d0a4109e811221f3c3ff2e016013b':
ShortcutManager: Address API review feedback.
Change-Id: I83cf33d390ba695117b88b397667e378902f439e
am: 1d616f0
* commit '1d616f0d880d0a4109e811221f3c3ff2e016013b':
ShortcutManager: Address API review feedback.
Change-Id: I83cf33d390ba695117b88b397667e378902f439e