Merge "Merge "ShortcutManager: finishing touches" into nyc-dev am: 7d164d35a4 am: 96ef96b563" into nyc-mr1-dev-plus-aosp
am: bfe2a64d7d
* commit 'bfe2a64d7d4e06fe551d556518ad7fb058a4363a':
Change-Id: I58fd06317a62b69b427bb2e0737e1e53e6de176d
This commit is contained in: