summaryrefslogtreecommitdiff
path: root/libs/gui/ConsumerBase.cpp
diff options
context:
space:
mode:
author Michael Wright <michaelwr@google.com> 2015-07-23 20:27:01 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-23 20:27:01 +0000
commit496513ce015ded2e79e92c0062b8dc1b300708fd (patch)
treef697559ac51bf6845070f1c59d1fdad3a3d55c12 /libs/gui/ConsumerBase.cpp
parentec41c2ab7197e2a738a6664f4ecf69f2d34ced6e (diff)
parentdd28d991f20c2c24b698006ba4e5750a0629057f (diff)
am dd28d991: (-s ours) 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 'dd28d991f20c2c24b698006ba4e5750a0629057f': DO NOT MERGE. Cancel touches as well as pointer gestures.
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
0 files changed, 0 insertions, 0 deletions