am cd2fff40: am 94e514eb: am e5a69c0d: Merge "Correct keymaster1 documentation."

* commit 'cd2fff40a9069dfcc49c7e70a994b513c16f32f2':
  Correct keymaster1 documentation.
This commit is contained in:
Shawn Willden 2015-09-17 00:58:22 +00:00 committed by Android Git Automerger
commit e8f4e671bf

Diff content is not available