OSDN Git Service

Merge "Fix small typo in ShortcutManager header docs" into nyc-mr1-dev
authorChet Haase <chet@google.com>
Wed, 12 Oct 2016 00:19:50 +0000 (00:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Oct 2016 00:19:50 +0000 (00:19 +0000)
am: aea27e1aea

Change-Id: I2e2f4d46787c51617b486edb7774cdf18bcaf52f


Trivial merge