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)
am: 01438a9213

* commit '01438a921309f8658b434846173e6fd9404161eb':

Change-Id: I500e4dfc3792e450c5e35acbb73e272f6f2d3ff6


Trivial merge