diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2010-04-02 09:28:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-02 09:28:50 -0700 |
| commit | 4888bd0e7c0c9b0509956da6e59d7bde1e8afb7d (patch) | |
| tree | 0e2b59fccd709fea9eee04c15a6c3001e00a5120 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 296db3d122066b98b815074fcc2e1fc7d6f2b7df (diff) | |
| parent | 34a9636ac02cdacbb737293e20e5fb0af18fa3fc (diff) | |
am 055897ac: am 28525488: am 9ab05fff: Merge "Fix bug 2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions