tree 8b07b88e3c0fe78883566ef09773f7913122c64e
parent 9964bb6cfa41af0baa95f822b786bd6b19e1024d
parent 2d89b6a9c5b88ad34784b8275141187afcc5045b
author David Neto <dneto@google.com> 1476888914 -0400
committer David Neto <dneto@google.com> 1476890478 -0400

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

Includes the following:
	2d89b6a Do not gitignore source/opt/build_module.*
	ee6c877 Test SPV_KHR_shader_draw_parameters support

Test: checkbuild.py for Linux, Windows; ran unit tests on Windows
Change-Id: Ica302fd13353d90b0745420a6d2b1a25d54a2297