| commit | f37d516de74fdbd22bd493135c9f59ab87a9ec05 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Fri Oct 16 20:37:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 16 20:37:03 2015 +0000 |
| tree | 22025ecd03d16665781865070d11c4d8e838b158 | |
| parent | f240a412a5ecb9dd104bf8a274d16f1683c2bcd1 [diff] | |
| parent | 66eec576a43ae05afb1f82f69e2e363ac475ac7b [diff] |
am 66eec576: am 2567e491: Merge "Wrap incomplete keymaster1 implementations with sw keymaster." * commit '66eec576a43ae05afb1f82f69e2e363ac475ac7b': Wrap incomplete keymaster1 implementations with sw keymaster.