diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2010-09-28 21:13:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 21:13:54 -0700 |
| commit | 83c3741a90b79a43d864528607963c09364f4f86 (patch) | |
| tree | 98c2aa54138fd908e08466ccfb8567ddb09e10bf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6f4ae27e33d74676119a4b04c93b6c34eda9c211 (diff) | |
| parent | 5be7524e145240058eff55e773dc71a7ab75a390 (diff) | |
am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread
Merge commit 'd6877fa4971710150de20453bf4ba54dca863429' into gingerbread-plus-aosp
* commit 'd6877fa4971710150de20453bf4ba54dca863429':
AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions