diff options
| author | Alex Klyubin <klyubin@google.com> | 2013-10-29 08:56:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-29 08:56:18 -0700 |
| commit | be7f22b7a8fefbabda7f6eb051e6009342e95d41 (patch) | |
| tree | 89a8097ff2f6a4246d78cf2ad2427c464f98ba66 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 76a8dac72d481830b394e378b1caa8dc21a95fba (diff) | |
| parent | 07873e3a72da254bcdf965f6fa76bdcc800ef511 (diff) | |
am 07873e3a: am 56922039: am b4cae4a9: Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites."
* commit '07873e3a72da254bcdf965f6fa76bdcc800ef511':
Fix SSLCertificateSocketFactory.getDefaultCipherSuites.
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions