tree f06cd32b9c9365716c7900fd16c66ff633f52e44
parent cf05b8c6f25dedcd2f21109116413efb4e84b509
parent 136f952b55e073d529c347ec79389d81a39e3c0e
author Makoto Onuki <omakoto@google.com> 1472685250 +0000
committer android-build-merger <android-build-merger@google.com> 1472685250 +0000

Backport shortcut manager test utilities to DR am: 0a15cd4ba0 am: fda26f6ffb am: 54541310a5
am: 136f952b55

Change-Id: I5bb2efdbfec4addc88baaea754e49a50b35d7c61