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 | 2cb57608965fd856b4b79b3f950d6c628e66aed5 (patch) | |
| tree | 9e2a7489dfcb1d44770d123689b3090e34591986 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ba1f05d4a816dd60a6be2a09858d8c9ecf3d552d (diff) | |
| parent | f3a892ab9347ce733b81ccb4913a91c586f8f367 (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