commit | a481160fa6b335850cbda8e9903de4972ad8541b | [log] [tgz] |
---|---|---|
author | Shawn Willden <swillden@google.com> | Fri Aug 14 03:17:54 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 14 03:17:54 2015 +0000 |
tree | 1fb0ca7ad10b52be6d6f4bf0ffe781faa698cbaf | |
parent | 8f25c6d86ea0e2eebe543ccef86e665046d190dd [diff] | |
parent | c2120744da8d0612ad54484b314f94e1e6e3a167 [diff] |
am c2120744: Merge "Wrap incomplete keymaster1 implementations with sw keymaster." into mnc-dr-dev * commit 'c2120744da8d0612ad54484b314f94e1e6e3a167': Wrap incomplete keymaster1 implementations with sw keymaster.