Merge \"LauncherApps should also throw when user is locked\" into nyc-mr1-dev

am: ba933b39ae

Change-Id: I56ac80b37f012bd7453428d17d95d63c16215296
This commit is contained in:
Makoto Onuki
2016-07-29 18:21:58 +00:00
committed by android-build-merger

Diff Content Not Available