diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2010-09-28 21:55:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 21:55:35 -0700 |
| commit | 880d7ea41c08b4d8cdb5baeba12600b27271459c (patch) | |
| tree | 6948868fce1e6ea9301a77e49d9880f8df2e7449 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7cc3fa06593b57cf59c1b931a1fd3418aa0da12b (diff) | |
| parent | 83c3741a90b79a43d864528607963c09364f4f86 (diff) | |
am 10b15c08: am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread
Merge commit '10b15c08bb8ffb1fddeac2e79c882a23ffe7a3de'
* commit '10b15c08bb8ffb1fddeac2e79c882a23ffe7a3de':
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