diff options
| author | Michael Wright <michaelwr@google.com> | 2015-09-23 17:49:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-23 17:49:52 +0000 |
| commit | dd71ee89afcb8cc27bcffa01cd0f8fc0db36fd65 (patch) | |
| tree | 7c2c372d943587cccf78e2be32aa96bfd017ea7f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | bc16fb988748f8870ff20afaf806f503ca960a6d (diff) | |
| parent | 0a77df93cb06cbd51527db6420250085ca9dd132 (diff) | |
am 0a77df93: am ce92ce9b: Merge "DO NOT MERGE Cancel touches as well as pointer gestures." into mnc-dr-dev
* commit '0a77df93cb06cbd51527db6420250085ca9dd132':
DO NOT MERGE Cancel touches as well as pointer gestures.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions