diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-03-27 21:42:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-27 21:42:08 +0000 |
| commit | d880dc2fb23aa3564c46169f7b0651bd2ca2c2de (patch) | |
| tree | f5c47173a613c184e3e2c66c85cee4c55e7f891f /rs/java/android/renderscript/Script.java | |
| parent | 80d5c4250f6a7b55b34bb033620df54cdbb31499 (diff) | |
| parent | 274a4ee3446e76a34a9cfe987e98f7bf4e53f78d (diff) | |
am 274a4ee3: Merge "Symmetric key import for AndroidKeyStore."
* commit '274a4ee3446e76a34a9cfe987e98f7bf4e53f78d':
Symmetric key import for AndroidKeyStore.
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions