diff options
| author | Justin Ho <justinho@google.com> | 2011-03-30 16:41:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-30 16:41:41 -0700 |
| commit | 4acb2055d2cd2b0b7c498a148c3170cb4e291450 (patch) | |
| tree | 46fcde2521016d0406c12e203472c99f5b64c57d /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a81d40ca9e1871ed7aa46ac331225cf4fcaaa874 (diff) | |
| parent | 50ce790103e96440eb805a6945abc8f09ab54ff4 (diff) | |
am 0b397314: am 0b251aec: am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1
* commit '0b3973143191962d3c4372523ed450f6a5bf0863':
Replacing browser playback controls for inactive videos Bug: 4136024
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions