Merge remote-tracking branch 'aosp/master' into HEAD
authorChris Forbes <chrisforbes@google.com>
Tue, 30 Jan 2018 01:46:30 +0000 (17:46 -0800)
committerChris Forbes <chrisforbes@google.com>
Tue, 30 Jan 2018 01:46:30 +0000 (17:46 -0800)
Change-Id: Ifa613aba874e394049ebd9d9bc0c9730505e595a

1  2 
android/cts/master/gles2-master.txt
android/cts/master/gles3-master.txt

Simple merge
Simple merge