diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2011-08-01 14:12:43 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-08-01 14:12:43 -0700 |
commit | 00451ed2d1f21945766bc0c59e762ef39cb391b8 (patch) | |
tree | 71c46690aed0ae5ffeed5a2b2cefabb2e95b3b2a /libs/rs/rsContext.h | |
parent | 44dabe3da3a2378815a98c7be1a1148b7714a1e4 (diff) | |
parent | 8fb7bd4d02cd4ad2111699778e64464d979f03bb (diff) | |
download | frameworks_base-00451ed2d1f21945766bc0c59e762ef39cb391b8.zip frameworks_base-00451ed2d1f21945766bc0c59e762ef39cb391b8.tar.gz frameworks_base-00451ed2d1f21945766bc0c59e762ef39cb391b8.tar.bz2 |
am 8fb7bd4d: am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit '8fb7bd4d02cd4ad2111699778e64464d979f03bb':
Stagefright: Return error if codec takes too long to return a buffer.
Diffstat (limited to 'libs/rs/rsContext.h')
0 files changed, 0 insertions, 0 deletions