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