| commit | bf9efff8dc8b9c6b48ca2b487c0f9c4a287733f2 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Tue Mar 17 20:49:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 17 20:49:19 2015 +0000 |
| tree | fca911b26bf7960b5a4c79f3843b8952e141e513 | |
| parent | 6ee02f24e40223b51c6e66d0f7d527f9e4f3e622 [diff] | |
| parent | 3bfd091a39594dfa7b748443cd247a609eb828d2 [diff] |
am 3bfd091a: Merge "Implement keymaster 1.0 crypto operations" * commit '3bfd091a39594dfa7b748443cd247a609eb828d2': Implement keymaster 1.0 crypto operations