| commit | f383cdcf3f86e49b7175739299669ce19c52c451 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Tue Nov 27 18:43:46 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 27 18:43:46 2012 -0800 |
| tree | 798c2eec7833168f97365b190eb8c89c8af1ee89 | |
| parent | e7af10a0473cab29de229ed403fabcd86319f061 [diff] | |
| parent | 131ff5b82134955889277fa38066704298214c87 [diff] |
am 131ff5b8: am 1c2c48cb: am f426ace9: Merge "Only wipe device if primary user (for failed password attempts)" into jb-mr1.1-dev * commit '131ff5b82134955889277fa38066704298214c87': Only wipe device if primary user (for failed password attempts)