Merge remote-tracking branch 'aosp/master' into HEAD
authorChris Forbes <chrisforbes@google.com>
Mon, 5 Feb 2018 21:10:48 +0000 (13:10 -0800)
committerChris Forbes <chrisforbes@google.com>
Mon, 5 Feb 2018 21:10:48 +0000 (13:10 -0800)
Change-Id: Iecc6b03291d94c485544ba6a270161f69fa267e3

1  2 
android/cts/master/gles2-master.txt
android/cts/master/gles3-master.txt
modules/egl/teglWideColorTests.cpp
modules/glshared/glsBuiltinPrecisionTests.cpp

Simple merge
Simple merge
Simple merge