diff options
| author | Eric Laurent <elaurent@google.com> | 2011-11-08 16:37:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-08 16:37:11 +0000 |
| commit | b5162170a74616b0da12475a1f203c3e84004ca1 (patch) | |
| tree | 6191b555f84848c224a8aaca7664edba7eb10ded /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ad0ff4dad221f3815ded9f83d3a894385f6f045b (diff) | |
| parent | 9104b8c6407dec6919b12ca737aac85725f9c1ad (diff) | |
am f3a892ab: Merge "AudioFlinger: mix track only when really ready" into ics-mr1
* commit 'f3a892ab9347ce733b81ccb4913a91c586f8f367':
AudioFlinger: mix track only when really ready
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions