Manual merge of a8aec64
authorPyry Haulos <phaulos@google.com>
Tue, 12 Apr 2016 00:35:35 +0000 (17:35 -0700)
committerPyry Haulos <phaulos@google.com>
Tue, 12 Apr 2016 00:39:59 +0000 (17:39 -0700)
commit9d8b0091b3fbbcc041631bbb67445ac7472bb7d8
tree9caa5583420877d889331ad8656f942028a00a4a
parent14535dcae753734a2eaf0842035834b279df9142
Manual merge of a8aec64

Change-Id: I7180faa25c717f325c14bde1895437c35388acfe
android/cts/master/com.drawelements.deqp.gles31.xml
android/cts/master/gles31-master.txt
android/cts/master/src/gles31-hw-issues.txt
android/cts/mnc/com.drawelements.deqp.gles31.xml
android/cts/mnc/gles31-master.txt
android/cts/mnc/src/gles31-master.txt