Reapply changes lost in a merge gone bad.
authorJarkko Pöyry <jpoyry@google.com>
Thu, 26 Mar 2015 18:26:34 +0000 (11:26 -0700)
committerJarkko Pöyry <jpoyry@google.com>
Thu, 26 Mar 2015 19:05:31 +0000 (12:05 -0700)
commitb802d8a74b19daa161a07eca2a90bc4620b94021
tree18d0080f0fbd4a507ca3284dac0d941ad5c78587
parent543d4b5a7bdd6567df98f863e204169164f755fc
Reapply changes lost in a merge gone bad.

- Merge of mirror-m-wireless-internal-release branch reverted changes
  that were applied to both master and backported to lmp branches. This
  change reapplies the reverted changes. Changes are:
  * bug 19543772 -- Remove io_blocks.match_different_member_interpolation
                    test from mustpass.
  * bug 19543594 -- Apply fix for tessellation fractional even test
                    verification.

Bug: 19936763
Change-Id: Ibc357e0e13d7993c91a4f4d60500dccb924eadec
android/cts/com.drawelements.deqp.gles31.xml
android/cts/es31-lmp-mr1.txt
android/cts/es31-lmp.txt
modules/gles31/functional/es31fTessellationTests.cpp