diff options
author | Teng-Hui Zhu <ztenghui@google.com> | 2011-03-21 17:48:59 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-21 17:48:59 -0700 |
commit | 217c6c7fbe82c94c5337cd7bfde7b2b4f623dc30 (patch) | |
tree | 0f30cb0035d4e9ea9777c58d6164e29be6c642e9 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 8f4c49d86e38f423ffeccd3ccc0c493246be30d0 (diff) | |
parent | 67440893ee32f057d2695b0eea9811e289b68603 (diff) |
am 67440893: am f82e5a2c: am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1
* commit '67440893ee32f057d2695b0eea9811e289b68603':
Support loading image and paused image for inline video
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions