OSDN Git Service

Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am: a23cd4614f
authorMakoto Onuki <omakoto@google.com>
Fri, 13 May 2016 18:59:30 +0000 (18:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 May 2016 18:59:30 +0000 (18:59 +0000)
commitfeea1622af40d36648c7072e4d357e4d2a826ed5
tree9c454d074e20ae45054128325c7e9c8d1ca6c629
parent1c59860a816f8db920ba6fa7bd2a8a6ef36ca9b6
parent446e5a536edeef02fa976898b2eca85b22296509
Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am: a23cd4614f
am: 446e5a536e

* commit '446e5a536edeef02fa976898b2eca85b22296509':
  ShortcutManager: Remove developer option from NYC

Change-Id: Iecf0fdd286c2154844075b01dbc622ae52fe7c6e