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