Commits
Jim Miller authored and Android Git Automerger committed a5094db1a83M
am cd1e7f7b: (-s ours) am 45fcaa54: Merge "Don\'t wipe device because of short PIN, patterns or passwords" into mnc-dev * commit 'cd1e7f7b9446413f073f35fa9dd3c944811f3e6a':
Showing diff to5d0ad985557