tree 03826a3a7271633a0c1c46a26931fa78d7a34d5f
parent 7b97b2332927d8a2aa1de2e2759123d576c9eec3
parent a7bc2e0aef1888f779011147e355e858b8e79eae
author Jim Miller <jaggies@google.com> 1437689216 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437689216 +0000

am a7bc2e0a: am 8c98f386: am 8cc0e80f: am 4a31ee0a: am 091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes.

* commit 'a7bc2e0aef1888f779011147e355e858b8e79eae':
  Make FingerprintService more tolerant of fingerprintd crashes.