| commit | ffb22827d74fcb7872a912ca022800a9b0818695 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Apr 01 21:56:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 01 21:56:55 2014 +0000 |
| tree | 26109baddb31c97a6d2466bf32d8115f82e1cc7b | |
| parent | 2c73e08d36985fbe5aa8b845730eeec8fe4379b1 [diff] | |
| parent | 2b6fe2990de78cfb64a27c19e5351cffe3ccb7d6 [diff] |
am 2b6fe299: am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev * commit '2b6fe2990de78cfb64a27c19e5351cffe3ccb7d6': Fix FLAG_DISMISS_KEYGUARD not working