tree 4424eb889fa478548a17d56b2f1baa0355be4c75
parent 94ef50a109e8d8f7e56f6f35d0a54c146e225e9d
parent 494c27679b8150fc7d9c7fc8ded9f95bf4afbe2d
author Uriel Rodriguez <urodriguez@google.com> 1318693461 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1318693461 -0700

Merge "going directly to backup after face unlock fails 15 times" into ics-mr0