tree 519321963778449578a27e7fd1de6f613659aea6
parent 51a288cf8d23830fb48d5b9cf61c7e5cda7301c4
parent 6a26fb1fd062558b912d18c76696fcb17c696894
author Mika Isojärvi <misojarvi@google.com> 1500410437 -0700
committer Mika Isojärvi <misojarvi@google.com> 1500410437 -0700

resolve merge conflicts of 6a26fb1f to deqp-dev

Test: Build apk, run scripts/check_build_sanity.py
Change-Id: I8565da05af24d195d0bf91c22eedd12d29864f5f