OSDN Git Service

am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Passwo...
authorAdrian Roos <roosa@google.com>
Thu, 3 Apr 2014 13:58:57 +0000 (13:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Apr 2014 13:58:57 +0000 (13:58 +0000)
* commit '3f38173fadc1423d4c36b265a2ab5fdc09d88271':
  Add lockout after trying to enter PIN / Password too often


Trivial merge