summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorMindy Pereira <mindyp@google.com>2010-10-15 09:29:40 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-15 09:29:40 -0700
commit97929aa9960cf72b9eb108a02fb6a7d6420e9ea6 (patch)
tree86bb8ed74070ebc7bf2f92b0908a2c2959e25217 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
parent7daa25d8b0d337d9c5d8330e18ccc80bdad4f36c (diff)
parentbaf5608941ae4de2bb5620fc81291f33da9d57ac (diff)
am baf56089: (-s ours) am 998c6777: Merge "Never show overscroll if the page scrolls at all." into gingerbread
Merge commit 'baf5608941ae4de2bb5620fc81291f33da9d57ac' * commit 'baf5608941ae4de2bb5620fc81291f33da9d57ac': Never show overscroll if the page scrolls at all.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions