diff options
author | Jim Miller <jaggies@google.com> | 2011-10-20 17:35:51 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-20 17:35:51 -0700 |
commit | 4da8dfc68d3ed8812debd0e258e5aac37665074c (patch) | |
tree | b245a9ff87f6be013b7e43627daeda10e24c0e11 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 6df428aaf950b75d322f16ca63641ad6434567a0 (diff) | |
parent | 3b91d48938df693cf6f84f657c5b95ee7d859af6 (diff) |
am 6b024448: Merge "Fix 5493266: Properly restore background after playing music" into ics-mr0
* commit '6b0244485c1d20261cffb0fbabebdfefd701867e':
Fix 5493266: Properly restore background after playing music
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions