diff options
| author | Kenny Root <kroot@google.com> | 2013-12-10 02:30:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-10 02:30:41 +0000 |
| commit | f2f03363bce7a1811a0ea3860223da56a6ab2359 (patch) | |
| tree | 6396b0847a986e03489acdba8526853e9ddfddea /rs/java/android/renderscript/Program.java | |
| parent | bdc748af8ce62778d2ad15040ecdfada6e4635fd (diff) | |
| parent | 140ecf2530fc9ad89e59d60b6f7b70bc2e1fdd0c (diff) | |
am 140ecf25: am ea18bdaf: am 25fd0c9e: Merge changes Ib4450c39,Ie7ed5655
* commit '140ecf2530fc9ad89e59d60b6f7b70bc2e1fdd0c':
preloaded-classes: remove some OpenSSLCipher modes
Add CertStoreParameters to preloaded-classes
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions