diff options
| author | Justin Ho <justinho@google.com> | 2012-01-23 15:16:00 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-23 15:16:00 -0800 |
| commit | d2ef8db2040885e8d2a23d7fb478013c5050685b (patch) | |
| tree | f51ab2224dac6fd980a461c51fef2e9c0ca10333 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e648baa3674afa7b9244619eb8ed36d0f6db4520 (diff) | |
| parent | 7ef6ae3b9b6b3a72f9929911ee19fbcf5cf17cfb (diff) | |
am feb1d988: (-s ours) am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
* commit 'feb1d988c8ea1a67a4edbf1914ea41ea73519e12':
DO NOT MERGE 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