diff options
| author | Narayan Kamath <narayan@google.com> | 2013-12-16 15:23:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-16 15:23:50 +0000 |
| commit | 8f90e47694b441941fdf5f17fcb9927ec23fb50b (patch) | |
| tree | df8168235a8a3b5465b6c108a2cdd2ce3d278411 /rs/java/android/renderscript/Sampler.java | |
| parent | 97b3e43ff108cb4761450732fc02e4b69502b8a0 (diff) | |
| parent | 28635ca3e3815ca01417ef03dd9debd938e34307 (diff) | |
am 28635ca3: am 44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."
* commit '28635ca3e3815ca01417ef03dd9debd938e34307':
Use StrictJarFile instead of JarFile for cert collection.
Diffstat (limited to 'rs/java/android/renderscript/Sampler.java')
0 files changed, 0 insertions, 0 deletions