diff options
| author | James Dong <jdong@google.com> | 2010-08-09 19:53:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-09 19:53:12 -0700 |
| commit | 778f649eac0f17ed37853066de2a5db3a1799572 (patch) | |
| tree | 509b165a9c92abd77498666313483d9216648e5b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | fdf9769ab08af1b4843d1566dda9a59466dff302 (diff) | |
| parent | f13b68e556413aa3854464abbb8df9ccd0cde1e6 (diff) | |
am 959909ef: Merge "Support multiple PPS and SPS in avcC box" into gingerbread
Merge commit '959909ef2855b119a9e8cd171dd0ebeb606b3a8f' into gingerbread-plus-aosp
* commit '959909ef2855b119a9e8cd171dd0ebeb606b3a8f':
Support multiple PPS and SPS in avcC box
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions
