OSDN Git Service

am 59769181: (-s ours) am 69ed3308: Merge "Allow system to disable lockscreen" into...
authorJason Monk <jmonk@google.com>
Thu, 27 Aug 2015 10:10:10 +0000 (10:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:10:10 +0000 (10:10 +0000)
commit74bd71bebef0e55ee61cc3023e29d444e80ca365
tree715d547d2502de8d04de0ec12233b3183ce62c99
parent914c176fc6e78586c4d800971342ac8963977540
parent59769181a52cd7dc2da12ef324c6a2336540d627
am 59769181: (-s ours) am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev

* commit '59769181a52cd7dc2da12ef324c6a2336540d627':