OSDN Git Service

am 4a306fd7: am 3a464785: Add a private API to get notified about lockout resets
authorJorim Jaggi <jjaggi@google.com>
Tue, 1 Sep 2015 00:58:31 +0000 (00:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Sep 2015 00:58:31 +0000 (00:58 +0000)
* commit '4a306fd744bc2f6f434cb7032580b063b704a9c5':
  Add a private API to get notified about lockout resets


Trivial merge