| commit | 61a7b7cff57dc66a1f64c9d7519fc1f6844b6915 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Dec 02 21:27:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 02 21:27:23 2014 +0000 |
| tree | 3606959835d55f683ad026eaca8f6370a5ad76ca | |
| parent | cc4cd6e1abe81d1edda7f1489dbd26298d38a699 [diff] | |
| parent | e4e7d2cdf40407240d63ef4f0a3249e726a1d632 [diff] |
am e4e7d2cd: am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev * commit 'e4e7d2cdf40407240d63ef4f0a3249e726a1d632': Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED