OSDN Git Service

Merge \\"Prevent shortcut access when user is locked\\" into nyc-mr1-dev am: 831dd7542f
authorMakoto Onuki <omakoto@google.com>
Wed, 27 Jul 2016 22:28:34 +0000 (22:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jul 2016 22:28:34 +0000 (22:28 +0000)
commitb02813e34fd33dc5af462360c2b71aaca83a5376
tree51b73ee5292b64e0bcac2b8b719a13c175ee092f
parent890f85d70feb0cd48176248c964b6bcbcaedcc24
parentedce9999ec017895ce67eb0a8fe21b9200fe4e7a
Merge \\"Prevent shortcut access when user is locked\\" into nyc-mr1-dev am: 831dd7542f
am: edce9999ec

Change-Id: If510ea9b31e005314cc1e623366efc6648cc3e55