| commit | 66eec576a43ae05afb1f82f69e2e363ac475ac7b | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Fri Oct 16 13:30:49 2015 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 16 13:30:49 2015 -0700 |
| tree | abc56eb37ceb687e7edff52161035adc6203feba | |
| parent | 549adfa1d1be5e0fe7753aa8a7fa8c57ecf1bac2 [diff] | |
| parent | 2567e491a1780b42a7e829352efdab18ab685f3d [diff] |
am 2567e491: Merge "Wrap incomplete keymaster1 implementations with sw keymaster." * commit '2567e491a1780b42a7e829352efdab18ab685f3d': Wrap incomplete keymaster1 implementations with sw keymaster.