diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-03-21 16:28:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-21 16:28:04 -0700 |
| commit | 67440893ee32f057d2695b0eea9811e289b68603 (patch) | |
| tree | ae13caa69f3599a60ccc2efc8b8c89c844a9bb4f /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3f29ffa56c5204fd3dc5587479b8a1c688665e41 (diff) | |
| parent | f82e5a2c903d16b6ca35313e184462625d482ff1 (diff) | |
am f82e5a2c: am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1
* commit 'f82e5a2c903d16b6ca35313e184462625d482ff1':
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