| commit | 6a65918307be42f0c70d13e7eb35b6b9dd4b6c99 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Mon Aug 03 20:59:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 03 20:59:10 2015 +0000 |
| tree | f068d00bc9b3179b999e4f59893b745e8b588cfd | |
| parent | 9bd3c31cce024c67641620d2e32f90982b8b0b6f [diff] | |
| parent | 59128d812ebf24f291a8a44ca98af109ad2f6870 [diff] |
am 59128d81: am d14fa9b4: am 3f9b9f2b: am 45fcaa54: Merge "Don\'t wipe device because of short PIN, patterns or passwords" into mnc-dev * commit '59128d812ebf24f291a8a44ca98af109ad2f6870': Don't wipe device because of short PIN, patterns or passwords