summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorShimeng (Simon) Wang <swang@google.com>2010-10-19 10:44:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-19 10:44:46 -0700
commitb0f67c9d062a95874bca4ba266a9ef6b7bf2182d (patch)
tree732d5d9344ac0df7996c2b2ff5f620ff5658b050 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
parent29d9849fd7b8b49c26fe7e7bae0ba01e907dc1b7 (diff)
parentb65058a45544ba4b9ff5dbad3cc306d86e9554e5 (diff)
am b65058a4: am 6b2274a1: Merge "Don\'t force ended when full screen video is returned manually." into gingerbread
Merge commit 'b65058a45544ba4b9ff5dbad3cc306d86e9554e5' * commit 'b65058a45544ba4b9ff5dbad3cc306d86e9554e5': Don't force ended when full screen video is returned manually.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions