OSDN Git Service

Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am: a23cd4614f...
authorMakoto Onuki <omakoto@google.com>
Fri, 13 May 2016 19:02:35 +0000 (19:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 May 2016 19:02:35 +0000 (19:02 +0000)
am: dc3bb2798a

* commit 'dc3bb2798ad962b6ca4e4508ff2189d747c75825':
  ShortcutManager: Remove developer option from NYC

Change-Id: Ia21a7274381dd28c16934d23570962867a08680b


Trivial merge