| commit | f75a736a3e19385d7635a1c8b5f25f70d3b08dbc | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Thu Nov 14 16:29:39 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 14 16:29:39 2013 -0800 |
| tree | d3b5b389b74462d68e0438c31a654b5894233748 | |
| parent | 9605791d4165435330979497191a6ac902762271 [diff] | |
| parent | 31ee7e19a040ab7660d39a6693f6ed38f7c961ad [diff] |
am 31ee7e19: am fb3d5cad: Don\'t show keyguard on top of CryptKeeper * commit '31ee7e19a040ab7660d39a6693f6ed38f7c961ad': Don't show keyguard on top of CryptKeeper