summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Michael Wright <michaelwr@google.com> 2015-09-23 16:44:23 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-09-23 16:44:23 +0000
commitbc16fb988748f8870ff20afaf806f503ca960a6d (patch)
tree08d0dd1d383decc4fafb855747e69a301f39758f /libs/ui/FramebufferNativeWindow.cpp
parent6263caf72f343dfbb18e7061c5453f78cfa19e72 (diff)
parentcff01363fcbdae5486287540e1f8917244aaea90 (diff)
am cff01363: Merge commit \'8a196b5630a93a3eb6df4cbe461917731e54fb35\' into merge-fix
* commit 'cff01363fcbdae5486287540e1f8917244aaea90': DO NOT MERGE Revert "am f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev"
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions