tree d093426eec07274c7a2967b50f28a38becd8b11b
parent 36734d9a3b63d904787dd525c775b54562f72128
parent 14132bb06e0a3af81f4243f695d11fc52de8e0b6
author Android Build Merger (Role) <android-build-merger@google.com> 1470089247 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1470089248 +0000

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