OSDN Git Service

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

Change-Id: If0820595b9695f1771c5c6b9ad52689d428447f5


Trivial merge