| commit | e4af5e6bb0a6d393b0e5cac2978366de0a23f3d8 | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Tue Mar 17 20:56:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 17 20:56:04 2015 +0000 |
| tree | 7c7c4f6b71a2f230013d23074864e360f9e44fca | |
| parent | 944befbec268f0094c3c174156187066737d187d [diff] | |
| parent | 6ee02f24e40223b51c6e66d0f7d527f9e4f3e622 [diff] |
am 6ee02f24: am f394e372: Merge "Implement keymaster 1.0 export_key method" * commit '6ee02f24e40223b51c6e66d0f7d527f9e4f3e622': Implement keymaster 1.0 export_key method