OSDN Git Service

am 94e514eb: am e5a69c0d: Merge "Correct keymaster1 documentation."
authorShawn Willden <swillden@google.com>
Thu, 17 Sep 2015 00:50:55 +0000 (00:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Sep 2015 00:50:55 +0000 (00:50 +0000)
* commit '94e514eb78714edd9267822a00b688b52ceeceeb':
  Correct keymaster1 documentation.


Trivial merge