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

am: 01438a9213

* commit '01438a921309f8658b434846173e6fd9404161eb':

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

Diff Content Not Available