OSDN Git Service

Merge \"LauncherApps should also throw when user is locked\" into nyc-mr1-dev
authorMakoto Onuki <omakoto@google.com>
Fri, 29 Jul 2016 18:21:58 +0000 (18:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Jul 2016 18:21:58 +0000 (18:21 +0000)
am: ba933b39ae

Change-Id: I56ac80b37f012bd7453428d17d95d63c16215296


Trivial merge