summaryrefslogtreecommitdiff
path: root/libs/gui/ConsumerBase.cpp
diff options
context:
space:
mode:
author Michael Wright <michaelwr@google.com> 2015-07-23 20:09:44 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-23 20:09:44 +0000
commitdd28d991f20c2c24b698006ba4e5750a0629057f (patch)
tree01d7c93c6052ced9bb31e10710a9498ee41444e6 /libs/gui/ConsumerBase.cpp
parentb4a8ec9f3dc3b4a73ee35a900d5646cfc35b8b91 (diff)
parentad0db31c695b45a9ba18ff653ce59b40ae36756a (diff)
am ad0db31c: am 9202e49d: am 5ea7ea44: (-s ours) Merge "DO NOT MERGE. Cancel touches as well as pointer gestures." into cw-d-mr1-dev
* commit 'ad0db31c695b45a9ba18ff653ce59b40ae36756a': DO NOT MERGE. Cancel touches as well as pointer gestures.
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
0 files changed, 0 insertions, 0 deletions