diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-10 04:33:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-10 04:33:48 +0000 |
| commit | 2c5eaa0157f20b591b4c5f998d81021719b2e261 (patch) | |
| tree | 626e59aa1f12ba0959050fe599f72918c2dde0b3 /rs/java/android/renderscript/RenderScript.java | |
| parent | 7819e443b0b571dc0b44d4cfd2f521d68370530a (diff) | |
| parent | 04a99c7b4435598e4f9d53fadbe5faca4ad7ebdc (diff) | |
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.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions