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