diff options
| author | Elliott Hughes <enh@google.com> | 2015-07-30 16:01:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-30 16:01:20 +0000 |
| commit | 734ae3554d47d48abfba5da7a401cdb550f8e79e (patch) | |
| tree | 4b141fbff80698ca511af8ced6e747f23fa74cac /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 897863baeb8446945b382f7e31874b3658fe84e5 (diff) | |
| parent | 1db1b5821f6819a602f2dda5950d12b6f6183c36 (diff) | |
am 1db1b582: am 204b4157: am f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK."
* commit '1db1b5821f6819a602f2dda5950d12b6f6183c36':
Use _WIN32 rather than HAVE_WINSOCK.
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions