OSDN Git Service

Merge "Fix two shortcut manager issues" into nyc-mr1-dev
authorMakoto Onuki <omakoto@google.com>
Wed, 10 Aug 2016 19:25:34 +0000 (19:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 Aug 2016 19:25:34 +0000 (19:25 +0000)
am: fc13448507

Change-Id: I07dca777edd3264c7bf8d6e110804d2e7df3cc97


Trivial merge