diff options
| author | James Dong <jdong@google.com> | 2010-07-30 14:52:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-30 14:52:05 -0700 |
| commit | 78316abcecf104701097bb5c9719ac4e8ad22463 (patch) | |
| tree | 7c8a60da10b140adeb9ac210a45422a8243d6541 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 333e73fc91901c91c289e10ca48cee4f194d8675 (diff) | |
| parent | 6c9c4ea97865e0ffe05b4e2248ffdc26e28d521b (diff) | |
am f0aa24d9: Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread
Merge commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974' into gingerbread-plus-aosp
* commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974':
Added damr box for AMR (NB and WB) sample entry
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions