| commit | c70f15fe298655de02c2e72023fafe6fc33d2a55 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Apr 01 21:41:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 01 21:41:15 2014 +0000 |
| tree | 60670f671da18299399851b0ea0b74efef4d2589 | |
| parent | c7f403f46d824c17f9bd1fb6447425eacc2cccfe [diff] | |
| parent | 2fc798a2270cda98366776af489d45c1043e831d [diff] |
am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev * commit '2fc798a2270cda98366776af489d45c1043e831d': Fix FLAG_DISMISS_KEYGUARD not working