OSDN Git Service

am ea42d4ed: am 9f74303e: Track unlock attempts per user.
authorJorim Jaggi <jjaggi@google.com>
Tue, 5 May 2015 01:23:27 +0000 (01:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 5 May 2015 01:23:27 +0000 (01:23 +0000)
* commit 'ea42d4edf2cbc0a0665d9c0a0ca089e01d8b8a44':
  Track unlock attempts per user.


Trivial merge