diff options
| author | James Dong <jdong@google.com> | 2010-06-03 11:30:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-03 11:30:03 -0700 |
| commit | 37d5dbc74278474a30ea8c9aef9af7d676df69a0 (patch) | |
| tree | a85071eb34a5dbf792ad54f2dcbf62b76e461d12 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2519d6ce4564f5305c9d0a9d73a9816a8bddd91e (diff) | |
| parent | 1ce3ee8a002811b3ee1c524b7599b53b363763be (diff) | |
am c40209ac: am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
Merge commit 'c40209ac60a64a7c08b0d0028060d5308fd7a0b8' into kraken
* commit 'c40209ac60a64a7c08b0d0028060d5308fd7a0b8':
Fix a Javadoc to clarify when setAudioStreamType() should be called.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions