summaryrefslogtreecommitdiff
path: root/opengl/libagl/texture.cpp
diff options
context:
space:
mode:
author Adam Powell <adamp@google.com> 2010-01-19 00:02:00 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2010-01-19 00:02:00 -0800
commita0a7b07365f268c5c102c4bd292d873c5dee3eea (patch)
treef4547aa06838a91fc394f17e6ff967f5414d2362 /opengl/libagl/texture.cpp
parentfd1a7126a8d5a74b5e5a2be543f0ee5005c80812 (diff)
parent48aab956d71749831a1da787352cf9a8b81456a6 (diff)
am b5a5a397: am 56a17690: Merge "TransformGestureDetector is now ScaleGestureDetector - scope reduced. N1 screen can\'t reliably handle translation and scaling at the same time." into eclair
Merge commit 'b5a5a39716502be2cd325a6f9b393e155c0636ee' * commit 'b5a5a39716502be2cd325a6f9b393e155c0636ee': TransformGestureDetector is now ScaleGestureDetector - scope reduced.
Diffstat (limited to 'opengl/libagl/texture.cpp')
0 files changed, 0 insertions, 0 deletions