Merge "Merge \\"Revert \\"LauncherApps should also throw when user is locked\\"\\" into nyc-mr1-dev am: 5faa852c57 am: 9e05cb8d54 am: cb10be47b1"
This commit is contained in:
committed by
Android (Google) Code Review
commit
8112f78008