OSDN Git Service

am 45fcaa54: Merge "Don\'t wipe device because of short PIN, patterns or passwords...
authorJim Miller <jaggies@google.com>
Mon, 3 Aug 2015 20:35:13 +0000 (20:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Aug 2015 20:35:13 +0000 (20:35 +0000)
commitcd1e7f7b9446413f073f35fa9dd3c944811f3e6a
treefe4ef001fb93e43fe7dee5a2cf3ffbcf58db6e8b
parent5be6cc6db941ce5756743191366f2a8b9c2e3b2f
parent45fcaa547dc5b9eb2c20879b290415daa1446004
am 45fcaa54: Merge "Don\'t wipe device because of short PIN, patterns or passwords" into mnc-dev

* commit '45fcaa547dc5b9eb2c20879b290415daa1446004':
  Don't wipe device because of short PIN, patterns or passwords