diff options
author | Eric Laurent <elaurent@google.com> | 2011-10-14 12:58:40 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-14 12:58:40 -0700 |
commit | c588b1616af852f620b83c8f7395ce193ea82aba (patch) | |
tree | 3f50851414840f91b65635f12bc2173cf21d865a /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 68fb7bd93b318f22ef5da83c67d5ffc29d27fc08 (diff) | |
parent | 2de68676e0deea5c8fce4b5dd62a8a67f5c89a7d (diff) |
am 615858a8: Merge "Indicate screen off condition to audio framework." into ics-mr0
* commit '615858a8ebb12b3541fd709e6e965ac814880261':
Indicate screen off condition to audio framework.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions