| commit | e2e945a8871310ab900dbe33b587e522446b9a6d | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Apr 07 22:58:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 07 22:58:53 2015 +0000 |
| tree | 25aca70e8b79dbf226c10a28b321444f6efcf549 | |
| parent | da1bc6057417e0ee6faa1cdd08a0be346a27659a [diff] | |
| parent | 40c4021a70c56bcc4d6f6569d795dff52ab4e369 [diff] |
am 40c4021a: Merge "third part apps can disable the secret lockscreen" * commit '40c4021a70c56bcc4d6f6569d795dff52ab4e369': third part apps can disable the secret lockscreen