resolve merge conflicts of f5a50cbc to deqp-dev
authorMika Isojärvi <misojarvi@google.com>
Thu, 24 Aug 2017 16:45:21 +0000 (09:45 -0700)
committerMika Isojärvi <misojarvi@google.com>
Thu, 24 Aug 2017 16:45:21 +0000 (09:45 -0700)
commitc729a4d929e33ab3ad5e5e69bc3ef1f00314aebb
treeaad755add28ec91c80292ca2400259fdc25363f0
parent73b392359044930cc8738825d8e415cf4981af12
parentf5a50cbc79d741edb804f59995a18f8802c711c2
resolve merge conflicts of f5a50cbc to deqp-dev

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