diff options
| author | Andreas Huber <andih@google.com> | 2010-09-01 13:57:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 13:57:44 -0700 |
| commit | 71e8b8313800f6abcfa42c5d023a7783361280a3 (patch) | |
| tree | 5a438d33fa40180d101fc1ad648ae2e7d3acbe3c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 014b578c6d664b20c88046f7ea9da49af0d728e9 (diff) | |
| parent | 94d559b8fa627d6b0b2b3d2a114f94c075b2eb2c (diff) | |
am 6c33904a: Merge "Now that AmrInputStream no longer relies on opencore, make sure it\'s registered in non-opencore builds." into gingerbread
Merge commit '6c33904ad948cb64245fbc5950c839e4d9e56de3' into gingerbread-plus-aosp
* commit '6c33904ad948cb64245fbc5950c839e4d9e56de3':
Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions