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