tree 5057b23ab235c1a89367ce0ba54c6ca329a27814
parent 28419df5016a1833181cbf6c819a349a7493da56
parent e272e6eaf4dfdfcca8cea7b1b8170cb8f821eca3
author Elliott Hughes <enh@google.com> 1475695727 +0000
committer android-build-merger <android-build-merger@google.com> 1475695727 +0000

Merge "Test for _WIN32 in frameworks/compile/slang instead of USE_MINGW." am: 08a1e287de
am: e272e6eaf4

Change-Id: I94fc9ab75fbabd2e14f5cc18de770448c2aeaf33