Merge remote-tracking branch 'khronos/master' into HEAD
authorChris Forbes <chrisforbes@google.com>
Thu, 23 Aug 2018 17:31:30 +0000 (10:31 -0700)
committerChris Forbes <chrisforbes@google.com>
Thu, 23 Aug 2018 17:31:30 +0000 (10:31 -0700)
commit12eb01d449383396010ff2d81b00a098c649f43a
treec5abcd103c462d0b0a5726df3dd99ec77f834b4a
parentd6c04dcc2eb9e1f3e51acd17fad36e35c19a583d
parentd558abdaa21527e529d0853f27248bfdd53670a6
Merge remote-tracking branch 'khronos/master' into HEAD

Change-Id: I58c439e2cf8859ca9cae5c78b8e065c5a652b1cd
android/cts/master/gles2-master.txt
android/cts/master/gles3-master.txt
android/cts/master/vk-master.txt