OSDN Git Service

Merge \"Prevent shortcut access when user is locked\" into nyc-mr1-dev
authorMakoto Onuki <omakoto@google.com>
Wed, 27 Jul 2016 21:24:16 +0000 (21:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jul 2016 21:24:16 +0000 (21:24 +0000)
am: 831dd7542f

Change-Id: I91a16fc26e261894db7ba4fa11772445f3c9fb0a


Trivial merge