OSDN Git Service

am e2e945a8: am 40c4021a: Merge "third part apps can disable the secret lockscreen"
authorJim Miller <jaggies@google.com>
Tue, 7 Apr 2015 23:08:05 +0000 (23:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Apr 2015 23:08:05 +0000 (23:08 +0000)
commit5dd10bd11a524e224a88615444bf8b52b1ec11d6
treec4a67dd09e72eede4bdc54158d5530a2457948e3
parent66a51c7080f26219652f84ae8d10b1e4d63409af
parente2e945a8871310ab900dbe33b587e522446b9a6d
am e2e945a8: am 40c4021a: Merge "third part apps can disable the secret lockscreen"

* commit 'e2e945a8871310ab900dbe33b587e522446b9a6d':
  third part apps can disable the secret lockscreen