tree f6938bcbfe9eafad9b6b3a3d00fd0ffd27bcf606
parent 136f952b55e073d529c347ec79389d81a39e3c0e
parent 7121484984eb030ad4bbf4f882ee8f093d4023eb
author Makoto Onuki <omakoto@google.com> 1472588355 +0000
committer android-build-merger <android-build-merger@google.com> 1472588355 +0000

Merge "Backport shortcut manager test utilities to DR" into nyc-dr1-dev am: 9480c98ddf am: e58471e7e8
am: 7121484984

Change-Id: I9f855aa1f81c5517de8a5e024afb10d5d8711ce3