OSDN Git Service

am 79a17924: am 0b55caf0: am a52a37b0: am 1b0b38cf: am 5d3c8c89: am 90630f6a: am...
authorAdrian Roos <roosa@google.com>
Thu, 3 Apr 2014 14:57:22 +0000 (14:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Apr 2014 14:57:22 +0000 (14:57 +0000)
* commit '79a179244612b09368209e2c95e48fe836aeab59':
  Add lockout after trying to enter PIN / Password too often


Trivial merge