OSDN Git Service

Merge "Remove ShortcutManager" into nyc-dev
authorMakoto Onuki <omakoto@google.com>
Thu, 12 May 2016 17:24:12 +0000 (17:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 May 2016 17:24:12 +0000 (17:24 +0000)
commit0ac2961dcb18ff9307d4882dd3247c0a863a0ee2
treeacb43b2281addada39366a90d8aac1f2819be651
parent391dbbf0226360238740016e238581113d012112
parent26edcba2c950701ff2dd8794687552bc37e4dfc8
Merge "Remove ShortcutManager" into nyc-dev
am: 26edcba2c9  -s ours

* commit '26edcba2c950701ff2dd8794687552bc37e4dfc8':
  Remove ShortcutManager

Change-Id: I02f70f07d24d3c7f58036d4e1535020074a1d3f0