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:36 +0000 (19:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 May 2016 19:02:36 +0000 (19:02 +0000)
commitbf30f5ff4d8713eb4ca108899a6ed6b91dc0c414
treeb5705a7a76b34ca8a0e1767ab4cd77d283298c09
parent7f8be3672ce98ff273c1f15ae2774f4c89bff802
parentb4e61334ffcd84e0f82cd37961ca8339c7c8c5f0
Merge "Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am: a23cd4614f am: 446e5a536e" into nyc-mr1-dev-plus-aosp
am: b4e61334ff

* commit 'b4e61334ffcd84e0f82cd37961ca8339c7c8c5f0':

Change-Id: I9002219976bcce0aaae3bedb3d9e8ead36b93621