resolve merge conflicts of 6a26fb1f to deqp-dev
authorMika Isojärvi <misojarvi@google.com>
Tue, 18 Jul 2017 20:40:37 +0000 (13:40 -0700)
committerMika Isojärvi <misojarvi@google.com>
Tue, 18 Jul 2017 20:40:37 +0000 (13:40 -0700)
commitecafdfbfe1f0f951f74440cff7c7af45c7875513
tree519321963778449578a27e7fd1de6f613659aea6
parent51a288cf8d23830fb48d5b9cf61c7e5cda7301c4
parent6a26fb1fd062558b912d18c76696fcb17c696894
resolve merge conflicts of 6a26fb1f to deqp-dev

Test: Build apk, run scripts/check_build_sanity.py
Change-Id: I8565da05af24d195d0bf91c22eedd12d29864f5f
AndroidGen.mk
external/fetch_sources.py
framework/egl/wrapper/eglwApi.inl
framework/egl/wrapper/eglwImplExt.inl
framework/qphelper/qpTestLog.h