diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2010-04-02 09:12:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-02 09:12:10 -0700 |
| commit | 4beb20feeb6f84063dce4b6680cf8fc7e828a93a (patch) | |
| tree | 7a13d65bca39938309b90f95dfb57f45aedfe844 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 26e4b29206c8e6f855134fdb607583174d16afa1 (diff) | |
| parent | 4c9bf79786da0d7c4251a08ee6eef33ca8594d11 (diff) | |
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 '9ab05fff41e983c9b3175096c320aefced81276b' into froyo-plus-aosp
* commit '9ab05fff41e983c9b3175096c320aefced81276b':
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