am 7c682d3d: am dafc0617: Remove negative tests for sliced 3D ASTC texture targets
authorPyry Haulos <phaulos@google.com>
Fri, 24 Jul 2015 05:09:18 +0000 (05:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Jul 2015 05:09:18 +0000 (05:09 +0000)
* commit '7c682d3d73044aa7e60ae01a397a5557cf0c7307':
  Remove negative tests for sliced 3D ASTC texture targets

1  2 
android/cts/master/com.drawelements.deqp.gles3.xml
android/cts/master/gles3-master.txt

Simple merge