summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/EventControlThread.cpp
diff options
context:
space:
mode:
author Courtney Goeltzenleuchter <courtneygo@google.com> 2017-08-05 04:16:59 +0000
committer android-build-merger <android-build-merger@google.com> 2017-08-05 04:16:59 +0000
commit021a23991e6ddd5e6a625f283d992cd63aa7073a (patch)
tree1a957390c9328b75f9bd9e2269bbd74f20b828a0 /services/surfaceflinger/EventControlThread.cpp
parent99e56daccfd06f8d8055ba37dd5c1fe34785c07d (diff)
parentef974d6c92e59596605cc831d93e2e76f64b6d20 (diff)
Merge "Fix build error from diamond merge" into oc-mr1-dev am: 0632b77833
am: ef974d6c92 Change-Id: Ib191b82aa336193545e53f4b545d219c0ae006c9
Diffstat (limited to 'services/surfaceflinger/EventControlThread.cpp')
0 files changed, 0 insertions, 0 deletions