am f2f9fcea: am dadf7db4: Remove tests infeasible for M.
authorKalle Raita <kraita@google.com>
Wed, 12 Aug 2015 00:11:53 +0000 (00:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Aug 2015 00:11:53 +0000 (00:11 +0000)
* commit 'f2f9fcead7aa0ca9c114803f1682fce0d0bc73dd':
  Remove tests infeasible for M.

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

Simple merge