am 6d60ecb9: am 48124f14: Remove some GLES3 multisample config cases
authorKalle Raita <kraita@google.com>
Wed, 12 Aug 2015 00:11:49 +0000 (00:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Aug 2015 00:11:49 +0000 (00:11 +0000)
* commit '6d60ecb982d47458d83bc410a866f2ad110a4dd8':
  Remove some GLES3 multisample config cases

1  2 
android/cts/master/com.drawelements.deqp.gles3.xml
scripts/build_android_mustpass.py

Simple merge