tree 55698f980750e340c9b1ded904aa319928eb09ad
parent b10627c37da21f2b5552ede269bda314d55e2fc8
parent ac2c9b372c070cc4678479617516957cf99f6db8
author David Neto <dneto@google.com> 1476888870 -0400
committer David Neto <dneto@google.com> 1476890468 -0400

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

Includes the following:
	ac2c9b3 Enable AMD extensions for Glslang by default.
	2045ead Work around bug with abspath on windows.

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