tree 4076d8e4e6ff914437991a4b8c3e252f9f4fd7d9
parent d4884e2f3c138a7cc881bb1fb34b672a1c9db595
parent 70335f3d30cf32a6f0352b75430aa6474821399d
author Shawn Willden <swillden@google.com> 1438030279 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438030279 +0000

am 70335f3d: Correct keymaster1 documentation.

* commit '70335f3d30cf32a6f0352b75430aa6474821399d':
  Correct keymaster1 documentation.