resolve merge conflicts of 297d0b5c to deqp-dev
authorMika Isojärvi <misojarvi@google.com>
Thu, 24 Aug 2017 17:23:41 +0000 (10:23 -0700)
committerMika Isojärvi <misojarvi@google.com>
Thu, 24 Aug 2017 17:23:41 +0000 (10:23 -0700)
commit4f2a813da3ab3cbbc72c1e70d8f3ae32bd53571d
treeaad755add28ec91c80292ca2400259fdc25363f0
parent03a09e99141eca6f7e82d4cd6818a1fd6d25ce50
parent297d0b5cf16454f5c4e725bdb200d1ab0b96177e
resolve merge conflicts of 297d0b5c to deqp-dev

Test: python scripts/check_build_sanity.py
Change-Id: I051006ca6e29b2f9ae116261aec1c0c3c234d6e0