diff options
| author | Andreas Huber <andih@google.com> | 2010-10-19 11:19:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-19 11:19:55 -0700 |
| commit | e01645137e919ddeb786175e5b25ac11c87962e3 (patch) | |
| tree | 1397ba6cbbba5a3e58cb1b733f294bd29e45b235 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1072b7f751db555c9b48fe4085a5a1391e215737 (diff) | |
| parent | 2d00c6050977f3e03665fbfef93f4f6aed041a63 (diff) | |
am 2d00c605: am 52bea277: Merge "If we encounter video stream EOS while seeking we may still need to seek audio." into gingerbread
Merge commit '2d00c6050977f3e03665fbfef93f4f6aed041a63'
* commit '2d00c6050977f3e03665fbfef93f4f6aed041a63':
If we encounter video stream EOS while seeking we may still need to seek audio.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions