diff options
| author | Kenny Root <kroot@google.com> | 2013-12-10 02:27:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-10 02:27:27 +0000 |
| commit | 140ecf2530fc9ad89e59d60b6f7b70bc2e1fdd0c (patch) | |
| tree | 084f6a7d51ef73bb4e6a04ef05e47459120251cd /rs/java/android/renderscript/Program.java | |
| parent | 263c4788dcf45f104f8668fd6621d1a7c39689b9 (diff) | |
| parent | ea18bdafb9e82a613f6b9b1f7ba4a9f1ea6c8b20 (diff) | |
am ea18bdaf: am 25fd0c9e: Merge changes Ib4450c39,Ie7ed5655
* commit 'ea18bdafb9e82a613f6b9b1f7ba4a9f1ea6c8b20':
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