OSDN Git Service

Merge "Enhance the shortcut manager javadoc." into oc-dev
authorMakoto Onuki <omakoto@google.com>
Thu, 20 Apr 2017 20:23:47 +0000 (20:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Apr 2017 20:23:47 +0000 (20:23 +0000)
commitbe699f8a36c7acbfe5b5788d7e513acfa4f4da4a
tree1024479cb5253684e699a53496e1ef6163b2cbff
parent46f7f1c245e3bd297ce594a4e3aa7e89363b5e05
parentaeb7505a7ff606326c07585cafbe8c15cac240dc
Merge "Enhance the shortcut manager javadoc." into oc-dev
am: aeb7505a7f

Change-Id: Iefc3efbdc1fc8ffbe1953a24686fc94e7f67da5d