resolve merge conflicts of 633ab6f3 to deqp-dev
authorPyry Haulos <phaulos@google.com>
Fri, 12 May 2017 20:46:38 +0000 (13:46 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 12 May 2017 20:46:38 +0000 (13:46 -0700)
commit9e1dff1fbf91e732e86367a4ffa533ddbb2497a1
tree1b3395b8daf6d517ee421aad99349723b7761f3e
parentabef7613781dfc4b07b8a37cd17ab5fe3dfe0c01
parent633ab6f3c84dba812f0beedc6a31884008ad9d6d
resolve merge conflicts of 633ab6f3 to deqp-dev

Change-Id: I879838e31c3fc6bbceb102c9b2720a2372360c1a