summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-03-28 08:34:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-28 08:34:06 -0700
commitc9832f271f93aa74790c500e0cef94594cc9bf93 (patch)
tree702b5e56762a0236c86242279894607948c8fb71 /opengl/tests/gl_basic/gl_basic.cpp
parentc583ce5e90a142ae0de3ada87fb0ad6390f99fcc (diff)
parent0e4a59ea2c73b4dd59a403fa49c9026eaff5d43b (diff)
am a4a81aef: am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1
* commit 'a4a81aef39b15649bda146476d98f23ac554887f': After a seek there's a brief period where audio time isn't reestablished.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions