Merge "Backporting shortcut manager test utils to mr1" into nyc-mr1-dev

am: 8664df3d76

Change-Id: I7abfe83f44599ff546034816e92b01a40a9f7a29
This commit is contained in:
Makoto Onuki
2016-08-23 23:51:09 +00:00
committed by android-build-merger

Diff Content Not Available