summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorChris Wren <cwren@android.com>2013-10-29 10:41:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-29 10:41:09 -0700
commite0b3f3e106d5b0b9eb31ed3bd43c8a536eb8d1ee (patch)
tree83a4efa7ba38daa51baf91b09341a30b2f7eed5a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentaf5d6e49526e97a267bedf076797fde6e9589bba (diff)
parent4742fe3cd79cf1f7d0c84ba87ee3ebdd5eb175d0 (diff)
am 4742fe3c: am 64742f84: Merge "show duration instead of remaining time." into klp-dev
* commit '4742fe3cd79cf1f7d0c84ba87ee3ebdd5eb175d0': show duration instead of remaining time.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions