am 77a3de20: am 5260313b: Remove linkage.uniform.basic.precision_conflict_? as infeasible
authorKalle Raita <kraita@google.com>
Wed, 12 Aug 2015 21:53:59 +0000 (21:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Aug 2015 21:53:59 +0000 (21:53 +0000)
* commit '77a3de20fae6d56558b56075afbc92871ef6c11a':
  Remove linkage.uniform.basic.precision_conflict_? as infeasible

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

Simple merge