OSDN Git Service

Merge "Backport shortcut manager test utilities to DR" into nyc-dr1-dev am: 9480c98dd...
authorMakoto Onuki <omakoto@google.com>
Tue, 30 Aug 2016 20:19:15 +0000 (20:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 30 Aug 2016 20:19:15 +0000 (20:19 +0000)
am: 7121484984

Change-Id: I9f855aa1f81c5517de8a5e024afb10d5d8711ce3


Trivial merge