resolved conflicts for merge of 50c6217e to master
authorColin Cross <ccross@android.com>
Fri, 24 Jul 2015 05:03:23 +0000 (22:03 -0700)
committerColin Cross <ccross@android.com>
Fri, 24 Jul 2015 05:03:23 +0000 (22:03 -0700)
commit2965afd058727d55347fdab1f93e849cce9e9f8e
tree812e17618e3e862c4e16d96e9dd1b2de0ae109c4
parent5e61c7b380089ecec8280a34b56bf728e0fd6586
parent50c6217ec2d4854113602183eb0ca20784865455
resolved conflicts for merge of 50c6217e to master

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