tree 8bbbd38b0ec899e10ce14b6c122f10a4257346e6
parent 58e2e14a52cc4c25fce62f43ce5daf0dda557f9b
parent 5b37c0d88c079f49602ff0bef5338e547658ef96
author Chris Wren <cwren@android.com> 1439831392 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439831392 +0000

am 5b37c0d8: am 22994783: am 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev

* commit '5b37c0d88c079f49602ff0bef5338e547658ef96':
  instrument fingerprint service