| commit | c68b9d6acc69104b67f9f133ee8fefd049d9c21a | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Apr 07 23:18:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 07 23:18:57 2015 +0000 |
| tree | b3041f7c1f39477d90db341c380893bf46d50a47 | |
| parent | 07e1967cfce129afd0db3beefde343fe59405dc5 [diff] | |
| parent | 5dd10bd11a524e224a88615444bf8b52b1ec11d6 [diff] |
am 5dd10bd1: am e2e945a8: am 40c4021a: Merge "third part apps can disable the secret lockscreen" * commit '5dd10bd11a524e224a88615444bf8b52b1ec11d6': third part apps can disable the secret lockscreen