| commit | 12184e17805be07181b065a7bfd16f71e5d2fa01 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Apr 01 22:27:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 01 22:27:43 2014 +0000 |
| tree | 5cf11f4a116e01f8fcaec4e57b0c663f5e1da080 | |
| parent | 707692ca0914a6f457f265eac56cb902a08f0943 [diff] | |
| parent | 74ee938dcc5e1ab0309dd87278e26f604c756b26 [diff] |
am 74ee938d: resolved conflicts for merge of ffb22827 to master * commit '74ee938dcc5e1ab0309dd87278e26f604c756b26': Fix FLAG_DISMISS_KEYGUARD not working