diff options
| author | Mindy Pereira <mindyp@google.com> | 2010-10-11 09:44:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-11 09:44:16 -0700 |
| commit | ac0ed70cc76be87260da4f7c595bd0df7a13b864 (patch) | |
| tree | 314a3aaeba1ce5405ce82946fe90869771a4e8a4 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 86d6f501e72a41886cb3aec0dcd9585581f8fe1e (diff) | |
| parent | 37c8ad779fb171470af2757b5750c1b5f2d1f368 (diff) | |
am 37c8ad77: (-s ours) am 13a81aad: Merge "DO NOT MERGE Limit the height of the pull glow." into gingerbread
Merge commit '37c8ad779fb171470af2757b5750c1b5f2d1f368'
* commit '37c8ad779fb171470af2757b5750c1b5f2d1f368':
DO NOT MERGE Limit the height of the pull glow.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions