| commit | 864666987be48548d1077a2aa780b1cacb950657 | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Tue Mar 17 20:30:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 17 20:30:40 2015 +0000 |
| tree | 0d58eff69267452ef5d84de0d0cfbcc73d27f4ff | |
| parent | e40d439731bf25e4ade0a5527ec13b7af18f31c2 [diff] | |
| parent | b4e09c2db0b918ef881a43719bc86ed81f33e9d8 [diff] |
am b4e09c2d: Merge "Implement keymaster 1.0 import_key method" * commit 'b4e09c2db0b918ef881a43719bc86ed81f33e9d8': Implement keymaster 1.0 import_key method