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