tree db8733d4bb0620f2e85a95ab39169845c837a627
parent 012c52fc4ce2daba3daa707cb59e983c2aa15b95
parent ae3759c7c9744a88ef60fc869c4c235b72fa4a22
author Mika Isojärvi <misojarvi@google.com> 1500057275 -0700
committer Mika Isojärvi <misojarvi@google.com> 1500057373 -0700

resolve merge conflicts of ae3759c7 to deqp-dev

Test: Build deqp apk and ran scripts/check_build_sanity.py
Change-Id: I2aad44982a04d1066c7a7f37fac139b735c5211b