| commit | 04a99c7b4435598e4f9d53fadbe5faca4ad7ebdc | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Fri Apr 10 00:06:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 10 00:06:25 2015 +0000 |
| tree | 1c76849f4858427b4d3f3b455f3c0cd1e30e4ce5 | |
| parent | 6951d555c2060e19bd9db46a772852db8aa24dfe [diff] | |
| parent | 82cba6aa3792b7d3b7eddf32c64cbf4a7a47e5a5 [diff] |
am 82cba6aa: am c6eb6288: Merge "Split key origin into TEE/not and generated/imported." * commit '82cba6aa3792b7d3b7eddf32c64cbf4a7a47e5a5': Split key origin into TEE/not and generated/imported.