summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-03-11 16:44:09 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-11 16:44:09 -0800
commite5c1bdfa98e419b0e8bb35dbbc14a4844fe91dc1 (patch)
tree7fa1b125a5b1481d4d6af6b7d9af7aad56027c4b /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
parent977d1fbf47be1a95c1f39ec559ba60b32d0bf749 (diff)
parentf7db87f0730ce91e3230b798b3a85bb47f655ba8 (diff)
am f7db87f0: am 87584f51: Merge "Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances" into honeycomb-mr1
* commit 'f7db87f0730ce91e3230b798b3a85bb47f655ba8': Fix bug 4083825 - Gesture zoom locked along content edges under some circumstances
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions