OSDN Git Service

Merge \"Revert \"LauncherApps should also throw when user is locked\"\" into nyc...
authorMakoto Onuki <omakoto@google.com>
Mon, 1 Aug 2016 17:41:57 +0000 (17:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Aug 2016 17:41:57 +0000 (17:41 +0000)
am: 5faa852c57

Change-Id: I85af4d9bd703a02c24a8975aaa2e348e9f4c04fe


Trivial merge