tree c88c70e1fd1e8937f4f28497cee2947e6df228dd
parent 8cf02164e6deb73bbccd7484a3bdad76b4be3411
parent c276932f6f8156574b0228443a4afe8acaff50dc
author David Neto <dneto@google.com> 1502461255 -0400
committer David Neto <dneto@google.com> 1502461337 -0400

Merge remote-tracking branch 'aosp/upstream-master' into update-shaderc

Includes:
c276932 Android.mk: Add source/id_descriptor.cpp to SPIRV-Tools
7d7725f Add SPIRV-Tools opt/inline_exhaustive_pass.cpp
ab73cf3 Add SPIRV-Tools source/opt/common_uniform_elim_pass.cpp
274d102 Support GLSL 4.6 and ESSL 3.2
9752555 Add source/opt/mem_pass.cpp to SPRIV-Tools
d10af57 Add Appveyor configs for VS 2015, VS 2017

Test: checkbuild.py on Linux; unit tests on Windows
Change-Id: I9c762418e942b048e309097a181b064b7db9d09c