summaryrefslogtreecommitdiff
path: root/libs/ui/FramebufferNativeWindow.cpp
diff options
context:
space:
mode:
author Michael Wright <michaelwr@google.com> 2015-09-24 22:56:42 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-09-24 22:56:42 +0000
commitf5177e3e5c09a12a723879c1c4147b0363203f84 (patch)
tree5eda0a1cb7768c86cb1441a35182a3f2b49d1e1a /libs/ui/FramebufferNativeWindow.cpp
parent7afe4b8eb7b3cc059f4f3f66808d77638f3346af (diff)
parent21d2fe7254188908bd1b16ec1ecf91d3d5e5440e (diff)
am 21d2fe72: (-s ours) am dd71ee89: am 0a77df93: am ce92ce9b: Merge "DO NOT MERGE Cancel touches as well as pointer gestures." into mnc-dr-dev
* commit '21d2fe7254188908bd1b16ec1ecf91d3d5e5440e': DO NOT MERGE Cancel touches as well as pointer gestures.
Diffstat (limited to 'libs/ui/FramebufferNativeWindow.cpp')
0 files changed, 0 insertions, 0 deletions