tree f201848a88c3378bf78d6d8cd90a1df7dc4a3c45
parent c5bdb9547318b18bffcb5c75f1d87b73591504c6
parent 7782ec5bab873e06201d4d775f628c6fe6e891ed
author Mika Isojärvi <misojarvi@google.com> 1500061568 -0700
committer Mika Isojärvi <misojarvi@google.com> 1500061568 -0700

resolve merge conflicts of 7782ec5b to deqp-dev

Test: Build the apk and ran scripts/check_build_sanity.p.
Change-Id: I0ac3ec6a73a4751bd5b075aaf59bb24c48f14f5c