tree 9859d34177becd63f9f9743140156bb924d3bb9b
parent 803ef79b77b02f3683f2a70b3166a16c0ab556e7
parent 9287f5d0156d571ef801364295ce2443df579bb4
author Jorim Jaggi <jjaggi@google.com> 1439319725 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439319725 +0000

am 9287f5d0: Merge "Hide FingerprintManagerCompatApi23" into mnc-dev

* commit '9287f5d0156d571ef801364295ce2443df579bb4':
  Hide FingerprintManagerCompatApi23