diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2012-01-06 15:51:44 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-06 15:51:44 -0800 |
commit | 7f52e90aea51e643d508aebb32257176ac25c6a3 (patch) | |
tree | 6eec8d541334d19af13d46239d603d86f52eefd7 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 79efd563cc2c5a3ac655d5e3ecdbc9735c8e6a6c (diff) | |
parent | 0981b259c73490f6a0778caca28b5ba9fc0160c2 (diff) |
am 4bc873e6: am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1
* commit '4bc873e6ff73200af866f8c9efca66ad8ed23682':
Switch camera sounds to always use the system enforced audio stream.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions