am b6ea7073: am 84e26791: (-s ours) Merge "DO NOT MERGE: Remove io_blocks.match_diffe...
authorJarkko Pöyry <jpoyry@google.com>
Fri, 28 Aug 2015 04:10:50 +0000 (04:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 04:10:50 +0000 (04:10 +0000)
commit6994de10883359befd2a45d9c88f16dd7f54bbe0
tree3972cb1532a59c8e736eb603b723a5597af4f4d8
parent7cbc2db7ed8d3712ae3467a3fb1ac151ca6699fd
parentb6ea70732180c06048bcc2ad700ddc00023d4bf4
am b6ea7073: am 84e26791: (-s ours) Merge "DO NOT MERGE: Remove io_blocks.match_different_member_interpolation test from mustpass." into lmp-sprout-dev

* commit 'b6ea70732180c06048bcc2ad700ddc00023d4bf4':
android/cts/com.drawelements.deqp.gles31.xml
android/cts/es31-mustpass-2014.2.9-2014-10-24.txt