summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Willden <swillden@google.com>2015-10-16 20:37:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-16 20:37:03 +0000
commitf37d516de74fdbd22bd493135c9f59ab87a9ec05 (patch)
tree22025ecd03d16665781865070d11c4d8e838b158
parentf240a412a5ecb9dd104bf8a274d16f1683c2bcd1 (diff)
parent66eec576a43ae05afb1f82f69e2e363ac475ac7b (diff)
downloadsecurity-f37d516de74fdbd22bd493135c9f59ab87a9ec05.tar.gz
am 66eec576: am 2567e491: Merge "Wrap incomplete keymaster1 implementations with sw keymaster."
* commit '66eec576a43ae05afb1f82f69e2e363ac475ac7b': Wrap incomplete keymaster1 implementations with sw keymaster.
0 files changed, 0 insertions, 0 deletions