resolve merge conflicts of e5f7483 to master
authorPyry Haulos <phaulos@google.com>
Wed, 19 Oct 2016 16:16:00 +0000 (09:16 -0700)
committerPyry Haulos <phaulos@google.com>
Wed, 19 Oct 2016 16:16:00 +0000 (09:16 -0700)
commitc4598ea31bf939fe13c8b8dd02264c24a04bd8f5
tree010b528d1976e281b11729564d7156058c8d3df9
parent5d4bf790d7406f34ef80333eb6193f230ec14845
parente5f74834175e076b46f5c002a2e2d17274cc5db9
resolve merge conflicts of e5f7483 to master

Change-Id: Id295761e33e8e58447f4b0bc9726f1bb03887d53
android/cts/master/gles3-master.txt