summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/EventControlThread.cpp
diff options
context:
space:
mode:
author Courtney Goeltzenleuchter <courtneygo@google.com> 2017-08-02 15:55:06 -0600
committer Romain Guy <romainguy@google.com> 2017-08-04 23:47:03 +0000
commita564aa8c84efed8555119dff31109e588225b298 (patch)
tree25d8ca461fd0d13cdfb59146c3ad95bd89224072 /services/surfaceflinger/EventControlThread.cpp
parent6aa5b4e7fdaa86a76e00e2508d7122e59cbd2aa2 (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 'services/surfaceflinger/EventControlThread.cpp')
0 files changed, 0 insertions, 0 deletions