| commit | 51e4f391717deb24ea7b22096df2ddb5535aee00 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Fri Oct 18 18:14:07 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 18 18:14:07 2013 -0700 |
| tree | 3e2507bf558df3f9c24730576e4b4d58a976b850 | |
| parent | 72950e65c87b2956446d1e7b9dbdc02ef3841774 [diff] | |
| parent | 495bd54c630691811e051247eec87e097c0bb01c [diff] |
am 495bd54c: am 42b7b692: Merge "Revert "Fix dodgy states of keyguard transport controls"" into klp-dev * commit '495bd54c630691811e051247eec87e097c0bb01c': Revert "Fix dodgy states of keyguard transport controls"