summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2009-12-11 13:01:12 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-11 13:01:12 -0800
commit23e1b91e2c0223106e67e76fe4f7b7b7abd3ad5a (patch)
treeaabc915b2771aa14c6c9a40f5ed6c5faa70a9cd9 /opengl/tests/gl_basic/gl_basic.cpp
parentf22f7af32422ccca34aec2eae2caeb21cf9428d9 (diff)
parenta22790ef39f457d2f433761876900924b55a8564 (diff)
am 8eac1637: Merge change I85adf5e5 into eclair-mr2
Merge commit '8eac1637b0f8ec7a2417eb53ebe56bb64c3b2b23' into eclair-mr2-plus-aosp * commit '8eac1637b0f8ec7a2417eb53ebe56bb64c3b2b23': Propagate duration from input to output only if available, support multiple full frames of audio per input buffer in AMR/AAC decoders.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions