diff options
| author | Andreas Huber <andih@google.com> | 2010-10-13 14:28:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-13 14:28:52 -0700 |
| commit | 4de1235c82dc06010be41d0d4a381dc79fe9b4f5 (patch) | |
| tree | 1ad98182fc998d6cd5cac18ea8be029f1d5de2fe /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f8659dd62b780abc94d9e78ac6e0e1dd378d8968 (diff) | |
| parent | f61daab2ed7f2ee40f761b57fc9793fca8d58375 (diff) | |
am 5f423917: Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread
Merge commit '5f42391701c0657d520d00f62a4c061b18ba1280' into gingerbread-plus-aosp
* commit '5f42391701c0657d520d00f62a4c061b18ba1280':
Attempt to derive the avg. bitrate of the entire stream from metadata.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions