| commit | 16d04f35c5e4d74bf8d99466de0e2c87431b4b94 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Fri Aug 14 03:28:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 14 03:28:36 2015 +0000 |
| tree | 6b7815d5b519f416ad9b7830af608726c9057984 | |
| parent | 8991d029afc7a97c45ce4eaae8fd6ada2462dc62 [diff] | |
| parent | a481160fa6b335850cbda8e9903de4972ad8541b [diff] |
am a481160f: am c2120744: Merge "Wrap incomplete keymaster1 implementations with sw keymaster." into mnc-dr-dev * commit 'a481160fa6b335850cbda8e9903de4972ad8541b': Wrap incomplete keymaster1 implementations with sw keymaster.