tree 409f702d1d87c680a916c5ec2aab97b7819c199e
parent 1257a2aa9beefd7cd581ba69173890b07303ef8b
parent e5a69c0de7994a77653adda6a26f3e84f5bf81f4
author Shawn Willden <swillden@google.com> 1442450482 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442450482 +0000

am e5a69c0d: Merge "Correct keymaster1 documentation."

* commit 'e5a69c0de7994a77653adda6a26f3e84f5bf81f4':
  Correct keymaster1 documentation.