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:
Android Build Merger (Role)
2016-08-01 22:07:27 +00:00
committed by Android (Google) Code Review

Diff Content Not Available