| commit | 495bd54c630691811e051247eec87e097c0bb01c | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Fri Oct 18 18:10:57 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 18 18:10:57 2013 -0700 |
| tree | a2f7f4f9fb4d5679ba05871372e8ff88f364c2ee | |
| parent | d47be031378e2ff43d61099ce5502f9428242eaf [diff] | |
| parent | 42b7b6927cd31679691b216d1ba09be31c24206e [diff] |
am 42b7b692: Merge "Revert "Fix dodgy states of keyguard transport controls"" into klp-dev * commit '42b7b6927cd31679691b216d1ba09be31c24206e': Revert "Fix dodgy states of keyguard transport controls"