| commit | 82cba6aa3792b7d3b7eddf32c64cbf4a7a47e5a5 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Apr 09 23:55:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 09 23:55:47 2015 +0000 |
| tree | c962b36b18ca88685a7985f0e9c0b79115e8feda | |
| parent | 56a6d371bd4978bb7dfa7cce8bfbcc0bb13abd93 [diff] | |
| parent | c6eb62882b09cf06e1e70c14e7878593d1a76477 [diff] |
am c6eb6288: Merge "Split key origin into TEE/not and generated/imported." * commit 'c6eb62882b09cf06e1e70c14e7878593d1a76477': Split key origin into TEE/not and generated/imported.