diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-09 23:55:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-09 23:55:47 +0000 |
| commit | 82cba6aa3792b7d3b7eddf32c64cbf4a7a47e5a5 (patch) | |
| tree | c962b36b18ca88685a7985f0e9c0b79115e8feda /rs/java/android/renderscript/RenderScript.java | |
| 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.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions