tree 86985f3c1006036e54ec07e7e9d902eaf7cf753e
parent 52f7a8af55e8e6264f12dd8a1c23dcc1eecacc83
parent 948b99ed9d7fdc45e9512d51667fb2b3c161608b
author Jim Miller <jaggies@google.com> 1440674883 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440674883 +0000

am 948b99ed: (-s ours) am 929e0a19: Add better documentation to fingerprint.h

* commit '948b99ed9d7fdc45e9512d51667fb2b3c161608b':