tree 46b541dced22ded9e559edaa0fd814a42523d900
parent 9f5e9ec76ab7c0698469ec75785294aa94480f57
parent 74d9c2aad1bcd52933a8dba7752b28e9aef1902d
author Jim Miller <jaggies@google.com> 1440195070 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440195070 +0000

am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev

* commit '74d9c2aad1bcd52933a8dba7752b28e9aef1902d':
  Fix type-o in FingerprintManager documentation