OSDN Git Service

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

Change-Id: I19b1df9a997a26d7f0ba9dbc179ae3cc31c23278


Trivial merge