| commit | f426ace9dab65c88b36a047bf921070edcf8cf61 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Tue Nov 27 15:37:40 2012 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 27 15:37:40 2012 -0800 |
| tree | 4b9ad05c03c5d4771627eeab5bb0f2d7c79a196d | |
| parent | 09a526faf311f77017f37af3fe8aba45bc2c32fb [diff] | |
| parent | 32f0742e52de8cebdbbb6c8ede9d6f4315d50189 [diff] |
Merge "Only wipe device if primary user (for failed password attempts)" into jb-mr1.1-dev