resolved conflicts for merge of 2fc614cb to master
authorPyry Haulos <phaulos@google.com>
Mon, 17 Aug 2015 20:05:48 +0000 (13:05 -0700)
committerPyry Haulos <phaulos@google.com>
Mon, 17 Aug 2015 20:05:48 +0000 (13:05 -0700)
commit8f5e0573dc2b60405a783d0a64a1efa27e835a3b
treef71be9c61a8d410d551fd2a8992a6b6aa44dff67
parentd2fbf5d2e187deea901f0874cc595de70b302743
parent2fc614cbd8cfa1b7c1ae2762c69dbd6f721b9b53
resolved conflicts for merge of 2fc614cb to master

Change-Id: Icfc6cc05231c37b8b0b8ed37c2d4e14ae369ed3d
android/cts/master/com.drawelements.deqp.gles3.xml
android/cts/master/com.drawelements.deqp.gles31.xml
android/cts/master/gles3-master.txt
android/cts/master/src/gles3-test-issues.txt