OSDN Git Service

am afac8dd6: am 70335f3d: Correct keymaster1 documentation.
authorShawn Willden <swillden@google.com>
Mon, 27 Jul 2015 21:18:07 +0000 (21:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Jul 2015 21:18:07 +0000 (21:18 +0000)
* commit 'afac8dd61e6f0554f24b6d4375b8eb426ea08884':
  Correct keymaster1 documentation.


Trivial merge