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)
commitbe46c1cc0e10ab34e65f3034b79b0c5690f4738c
tree7df461a743889d8ded0b92be55a9b2fdd73fcd92
parent5e5f6ade7618976ff80c3bccccfe97c34f932911
parent887ba74d8b91f72b9730523f1801828961b8ca90
Merge remote-tracking branch 'aosp/master' into HEAD

Change-Id: Iecc6b03291d94c485544ba6a270161f69fa267e3
android/cts/master/gles2-master.txt
android/cts/master/gles3-master.txt
modules/egl/teglWideColorTests.cpp
modules/glshared/glsBuiltinPrecisionTests.cpp