diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2010-04-02 09:16:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-02 09:16:05 -0700 |
| commit | 34a9636ac02cdacbb737293e20e5fb0af18fa3fc (patch) | |
| tree | a02db8ec4f9529c70a90e48822c7a21f2ac18b25 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 9d4692877593c573f4456bad27a20a0647feff1a (diff) | |
| parent | 4beb20feeb6f84063dce4b6680cf8fc7e828a93a (diff) | |
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
Merge commit '28525488fb5769fb119b01db17dc0ed305f0e7b0' into kraken
* commit '28525488fb5769fb119b01db17dc0ed305f0e7b0':
Fix bug 2565463 Ensure an object cannot appear twice in the
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions