Merge "Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am: a23cd4614f
am: 446e5a536e" into nyc-mr1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
b4e61334ff