| commit | 97dfe726043c1e2e0dbf958e59f9d299731bab5b | [log] [tgz] |
|---|---|---|
| author | Uriel Rodriguez <urodriguez@google.com> | Mon Oct 17 11:31:19 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 17 11:31:19 2011 -0700 |
| tree | 886bedca4339dac0d9c3983bd99d617596460ff0 | |
| parent | 84cbfebcfe0a6ac8a9040837238eb69bb9694478 [diff] | |
| parent | 00f99e88c88a9e033b391d57304823efb0cefba9 [diff] |
am d814d4fa: Merge "going directly to backup after face unlock fails 15 times" into ics-mr0 * commit 'd814d4fa0c76a0384f7e32816e1ca36f237911c6': going directly to backup after face unlock fails 15 times