diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-05-26 11:38:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-26 11:38:24 -0700 |
| commit | 97683e82843d2b7cf5778f0a725879b99743ad51 (patch) | |
| tree | bf042c61fe71a52fab2883a5aee00630e2417493 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3453b1c584f456a18f17d74a72c044b4e39c6405 (diff) | |
| parent | 4e3ba25cc718bbc6db0a332c4105debc4b3552d3 (diff) | |
am 4e3ba25c: (-s ours) am 4bd89fb0: am 82e4373e: Merge "Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)" into honeycomb-mr2
* commit '4e3ba25cc718bbc6db0a332c4105debc4b3552d3':
Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions