am 84e26791: Merge "DO NOT MERGE: Remove io_blocks.match_different_member_interpolati...
authorJarkko Pöyry <jpoyry@google.com>
Thu, 12 Mar 2015 18:18:01 +0000 (18:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 12 Mar 2015 18:18:01 +0000 (18:18 +0000)
* commit '84e26791531053e64c4ab04aa48adb77ce2ecc73':
  DO NOT MERGE: Remove io_blocks.match_different_member_interpolation test from mustpass.

1  2 
android/cts/com.drawelements.deqp.gles31.xml
android/cts/es31-lmp.txt

Simple merge