diff options
| author | Courtney Goeltzenleuchter <courtneygo@google.com> | 2017-08-02 15:55:06 -0600 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-10-24 15:07:32 -0700 |
| commit | adaa3263e5f550fcdc58405ef49482b60c14123a (patch) | |
| tree | 5ca72f011a6293fe798752df06aa68af2b1f1c8e /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6fb31e8eb266e80cc2bf0132962272734baa8d66 (diff) | |
Fix build error from diamond merge
Somehow between various merges on master and oc-dr1-dev
master ended up in bad state.
CL's involved are:
cd939aa6622430 Fix build for non-HWC2 targets (master)
281e8113d0ce Communicate composition buffer dataspace to HWC (oc-dr1-dev)
79d272442ce13 Communicate composition buffer dataspace to HWC (master)
I think 281e got merged into master and re-introduced the change that
was fixed by cd93.
Test: make
Change-Id: I087244348392098f516905eb1cebebf0362fcc20
(cherry picked from commit 6461806da8d8f0677ce337700153e5a972c36593)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions