| commit | af0aec584a824dbc772170038128755954dc12ac | [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 | 297fd5a2d408edfa17efb272c3fd9729d9f23c15 | |
| parent | 82ced8250f78aff7b96f7c6ae75bcfaf1023d336 [diff] | |
| parent | d814d4fa0c76a0384f7e32816e1ca36f237911c6 [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