Merge \\"Revert \\"LauncherApps should also throw when user is locked\\"\\" into nyc-mr1-dev am: 5faa852c57 am: 9e05cb8d54

am: cb10be47b1

Change-Id: I919be2385606e37c2a253f5d53a254dda87ca8ef
This commit is contained in:
Makoto Onuki
2016-08-01 22:06:11 +00:00
committed by android-build-merger

Diff Content Not Available