diff options
| author | Justin Ho <justinho@google.com> | 2011-03-30 15:59:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-30 15:59:19 -0700 |
| commit | 667fe67ba005172ad34ea711309df684f689c2b6 (patch) | |
| tree | 2aa2cb6936c908494527967d2b865eaf6392b787 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6fb9cf809bd7899abf89843bb55a0790df3f53ee (diff) | |
| parent | cf98fbf9ce22aa2d8b0b9d68699b8c5ff447e35a (diff) | |
am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1
* commit '01b13a11e6492ebba66c496eaefdb008f2638870':
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