summaryrefslogtreecommitdiffstats
path: root/libs/rs
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2011-08-01 14:10:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-08-01 14:10:39 -0700
commit8fb7bd4d02cd4ad2111699778e64464d979f03bb (patch)
tree7a28275fa276a0ac31de9732df4abbca4784f28a /libs/rs
parent72b7a7d90b631a703681751c02f1447e3c75ccb0 (diff)
parent5bb3129c7eabce34d7c1469826e1795d4b225bb3 (diff)
downloadframeworks_base-8fb7bd4d02cd4ad2111699778e64464d979f03bb.zip
frameworks_base-8fb7bd4d02cd4ad2111699778e64464d979f03bb.tar.gz
frameworks_base-8fb7bd4d02cd4ad2111699778e64464d979f03bb.tar.bz2
am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit '5bb3129c7eabce34d7c1469826e1795d4b225bb3': Stagefright: Return error if codec takes too long to return a buffer.
Diffstat (limited to 'libs/rs')
0 files changed, 0 insertions, 0 deletions