diff options
| author | Andreas Huber <andih@google.com> | 2011-03-16 13:36:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-16 13:36:35 -0700 |
| commit | 1a47fc353157bf9798c8a7425f106681e14bf4a5 (patch) | |
| tree | 2e102cf29c10bb697ebe997274f3b6c0b4c9830c /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 89de72d83a1593ceb268f9433cd10455c66fc3af (diff) | |
| parent | 7532ae7f79d6d849faae1a9bee171c66bd534d97 (diff) | |
am 7532ae7f: am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1
* commit '7532ae7f79d6d849faae1a9bee171c66bd534d97':
DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions