Merge "Another attempt at capturing full removal list for 22713865" into marshmallow...

am: be0cde5

* commit 'be0cde5d57c500c48ff89581418680e6b6937c03':
  Another attempt at capturing full removal list for 22713865

Change-Id: Ie42d5a8f6af6270c0c3bfa843199416e09dc6ff1

diff --combined android/cts/master/com.drawelements.deqp.gles31.xml
index bbc0403,cd0612e..ebab188
--- 1/android/cts/master/com.drawelements.deqp.gles31.xml
--- 2/android/cts/master/com.drawelements.deqp.gles31.xml
+++ b/android/cts/master/com.drawelements.deqp.gles31.xml
@@@ -1,5 -1,5 +1,5 @@@
  <?xml version="1.0" encoding="utf-8"?>
 -<TestPackage appPackageName="com.drawelements.deqp.gles31" deqp:glesVersion="196609" name="dEQP-GLES31" runtimeHint="45" testType="deqpTest" xmlns:deqp="http://drawelements.com/deqp">
 +<TestPackage appPackageName="com.drawelements.deqp.gles31" deqp:glesVersion="196609" name="dEQP-GLES31" testType="deqpTest" xmlns:deqp="http://drawelements.com/deqp">
        <TestSuite name="dEQP-GLES31">
                <TestCase name="info">
                        <Test name="vendor">
@@@ -67897,17 -67897,6 +67897,6 @@@
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        </Test>
                                                </TestCase>
-                                               <TestCase name="vertex_geometry_fragment">
-                                                       <Test name="fbo_bbox_equal">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="fbo_bbox_larger">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="fbo_bbox_smaller">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                               </TestCase>
                                                <TestCase name="vertex_tessellation_geometry_fragment">
                                                        <Test name="fbo_bbox_equal">
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
@@@ -68221,17 -68210,6 +68210,6 @@@
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                        </Test>
                                                </TestCase>
-                                               <TestCase name="vertex_geometry_fragment">
-                                                       <Test name="fbo_bbox_equal">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="fbo_bbox_larger">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                                       <Test name="fbo_bbox_smaller">
-                                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                                       </Test>
-                                               </TestCase>
                                                <TestCase name="vertex_tessellation_geometry_fragment">
                                                        <Test name="fbo_bbox_equal">
                                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>