OSDN Git Service

am 52f7a8af: am 7ebe592c: (-s ours) am 70335f3d: Correct keymaster1 documentation.
authorShawn Willden <swillden@google.com>
Thu, 27 Aug 2015 14:43:23 +0000 (14:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:43:23 +0000 (14:43 +0000)
commit0d0532358809e283f5670078eabc5375985a71c1
tree8ca0c26a0b3a5b109c55513efebd3a5f73d12e4e
parent772e04fcd31387a8b9be4580967ec5c0692f8f91
parent52f7a8af55e8e6264f12dd8a1c23dcc1eecacc83
am 52f7a8af: am 7ebe592c: (-s ours) am 70335f3d: Correct keymaster1 documentation.

* commit '52f7a8af55e8e6264f12dd8a1c23dcc1eecacc83':