tree 868609e7eda31649bbc44ec901c505fb7e87ac00
parent 872e8f77a9cb683c4cb0d0528e26cdca121244aa
parent 6a188487c4eaec361c812197d99a5c24ad4c65d4
author Jorim Jaggi <jjaggi@google.com> 1441943441 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441943441 +0000

am 6a188487: am d5411598: am a58bff50: am 3cf7eef1: Listen for fingerprint when on bouncer

* commit '6a188487c4eaec361c812197d99a5c24ad4c65d4':
  Listen for fingerprint when on bouncer