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