OSDN Git Service

Merge "LauncherApps should also throw when user is locked" into nyc-mr1-dev
authorMakoto Onuki <omakoto@google.com>
Tue, 2 Aug 2016 17:58:18 +0000 (17:58 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 2 Aug 2016 17:58:20 +0000 (17:58 +0000)

Trivial merge