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)
* commit '45fcaa547dc5b9eb2c20879b290415daa1446004':
  Don't wipe device because of short PIN, patterns or passwords


Trivial merge