resolve merge conflicts of 59febde9 to deqp-dev
authorMika Isojärvi <misojarvi@google.com>
Thu, 24 Aug 2017 17:13:34 +0000 (10:13 -0700)
committerMika Isojärvi <misojarvi@google.com>
Thu, 24 Aug 2017 17:13:34 +0000 (10:13 -0700)
commit793f9b0e80cb33a3430976f2ff87c5e0d6ca43a3
treeaad755add28ec91c80292ca2400259fdc25363f0
parent9e0a55bea20f0867a64710f5eebbd3dba54b64b3
parent59febde93580b338f51c23a7f036195e10efa8c6
resolve merge conflicts of 59febde9 to deqp-dev

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