| commit | 1c2c48cba61e87f54f4b413b2192963dc71d76e3 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Tue Nov 27 15:40:36 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 27 15:40:36 2012 -0800 |
| tree | 9101e18d4679a907ba644cd03951b41803722027 | |
| parent | 712c26865c5d0491054143c15579c0c5db59923a [diff] | |
| parent | f426ace9dab65c88b36a047bf921070edcf8cf61 [diff] |
am f426ace9: Merge "Only wipe device if primary user (for failed password attempts)" into jb-mr1.1-dev * commit 'f426ace9dab65c88b36a047bf921070edcf8cf61': Only wipe device if primary user (for failed password attempts)