Merge "Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am: a23cd4614f am: 446e5a536e" into nyc-mr1-dev-plus-aosp

am: b4e61334ff

* commit 'b4e61334ffcd84e0f82cd37961ca8339c7c8c5f0':

Change-Id: I9002219976bcce0aaae3bedb3d9e8ead36b93621
This commit is contained in:
Makoto Onuki
2016-05-13 19:02:36 +00:00
committed by android-build-merger

Diff Content Not Available