diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2010-04-13 11:53:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-13 11:53:57 -0700 |
| commit | 6feb51a62989c1ca0b207cebe0c672ead34390c0 (patch) | |
| tree | 744fcc6bd303f071d2ff642be0cefb7e8d8247b6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 914dc6521913be1a1d90af7db7830e503699908d (diff) | |
| parent | 54fddcb1e6c12d46059493401a1026c908fe5261 (diff) | |
am 34b2ecc8: am c30890e1: Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo
Merge commit '34b2ecc82aae3d317c2f4985049f68df3f8adbd7' into kraken
* commit '34b2ecc82aae3d317c2f4985049f68df3f8adbd7':
Fix bug 2578813 Delay pausing music and routing audio for car docks
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions