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