tree 626e59aa1f12ba0959050fe599f72918c2dde0b3
parent 7819e443b0b571dc0b44d4cfd2f521d68370530a
parent 04a99c7b4435598e4f9d53fadbe5faca4ad7ebdc
author Alex Klyubin <klyubin@google.com> 1428640428 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428640428 +0000

am 04a99c7b: am 82cba6aa: am c6eb6288: Merge "Split key origin into TEE/not and generated/imported."

* commit '04a99c7b4435598e4f9d53fadbe5faca4ad7ebdc':
  Split key origin into TEE/not and generated/imported.