OSDN Git Service

am 7ebe592c: (-s ours) am 70335f3d: Correct keymaster1 documentation.
authorShawn Willden <swillden@google.com>
Thu, 27 Aug 2015 11:28:02 +0000 (11:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:28:02 +0000 (11:28 +0000)
commit52f7a8af55e8e6264f12dd8a1c23dcc1eecacc83
tree86985f3c1006036e54ec07e7e9d902eaf7cf753e
parent13bbf68a7d2169473b9a47c3084e7d1325eb83d3
parent7ebe592cb7e52e5b089dd27bedb68ee5dd91f6f8
am 7ebe592c: (-s ours) am 70335f3d: Correct keymaster1 documentation.

* commit '7ebe592cb7e52e5b089dd27bedb68ee5dd91f6f8':