tree 9c9404b6845609cb025784bd699b53880294aea0
parent 8b4d28a3b70b53178986313e4f271b4e78ae10d3
parent 463bf7cc36660174166ad2aab7d1814bf35c8066
author Jorim Jaggi <jjaggi@google.com> 1441835963 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441835963 +0000

am 463bf7cc: am 46154b8f: am b5304547: am 5e354223: Use AlarmManager for lockout reset

* commit '463bf7cc36660174166ad2aab7d1814bf35c8066':
  Use AlarmManager for lockout reset