diff options
| author | Elliott Hughes <enh@google.com> | 2015-07-30 15:32:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-30 15:32:51 +0000 |
| commit | 204b4157b3fdbeea8859c4ad0e29be18d74e6f5f (patch) | |
| tree | 02d5219d39c17ae51a15911b75d17315fc90be3f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e528f048689868a2d4dfdf23b553fe536acd15cd (diff) | |
| parent | f8a6a2f602ad4ec049b2d2d4741571a76c3d014b (diff) | |
am f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK."
* commit 'f8a6a2f602ad4ec049b2d2d4741571a76c3d014b':
Use _WIN32 rather than HAVE_WINSOCK.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions