diff options
| author | Elliott Hughes <enh@google.com> | 2015-07-30 15:47:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-30 15:47:11 +0000 |
| commit | 1db1b5821f6819a602f2dda5950d12b6f6183c36 (patch) | |
| tree | 04cb551ba9ca21dd4f343b87964fbf414b697edb /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 5745eead22ecd70fd9d418f1a6ac23d837dbdbe8 (diff) | |
| parent | 204b4157b3fdbeea8859c4ad0e29be18d74e6f5f (diff) | |
am 204b4157: am f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK."
* commit '204b4157b3fdbeea8859c4ad0e29be18d74e6f5f':
Use _WIN32 rather than HAVE_WINSOCK.
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions