OSDN Git Service

Merge "Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am...
authorMakoto Onuki <omakoto@google.com>
Fri, 13 May 2016 19:02:37 +0000 (19:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 May 2016 19:02:37 +0000 (19:02 +0000)
commit10e793f71ea6d6987797770dbc11386ae5aac470
treeb5705a7a76b34ca8a0e1767ab4cd77d283298c09
parentbf30f5ff4d8713eb4ca108899a6ed6b91dc0c414
parent01438a921309f8658b434846173e6fd9404161eb
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