diff options
| author | Eric Laurent <elaurent@google.com> | 2012-01-24 11:51:47 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-24 11:51:47 -0800 |
| commit | dd347d515d4a4e42b2aba89a8e471392026b7824 (patch) | |
| tree | 9c66ad628619c851ad9ca802cb2ba61b446d771b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 67cda1a0ec2f443293d0ada7c49708ff4a11c8c7 (diff) | |
| parent | 41773d46556aa47d4322ff89fdaf7d1345c2d1f2 (diff) | |
am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
* commit '41773d46556aa47d4322ff89fdaf7d1345c2d1f2':
DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions