diff options
| author | Narayan Kamath <narayan@google.com> | 2013-12-16 15:29:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-16 15:29:39 +0000 |
| commit | 95de161efd27f319929c438d6f330ab72f843a9b (patch) | |
| tree | 5d9c60544cbaf65ebdb05333004c272855394d15 /rs/java/android/renderscript/Sampler.java | |
| parent | d44e20c11e668fdb915573de8519a1531be3e93f (diff) | |
| parent | 1dfe799027383bb0f2c2f38facca631d4968de8e (diff) | |
am 1dfe7990: am 8f90e476: am 28635ca3: am 44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."
* commit '1dfe799027383bb0f2c2f38facca631d4968de8e':
Use StrictJarFile instead of JarFile for cert collection.
Diffstat (limited to 'rs/java/android/renderscript/Sampler.java')
0 files changed, 0 insertions, 0 deletions