diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2011-08-01 14:10:39 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-08-01 14:10:39 -0700 |
commit | 1de2393648b9fe43977ef88b72489fec05d629a9 (patch) | |
tree | 8136f77079960d466a895235d601d97d258a4f06 /drm | |
parent | b2ac59b3a1748eef58c228a7e808d40bd1741dcf (diff) | |
parent | 93a1e245c94f14b6fb68361f76e46285431dab26 (diff) | |
download | frameworks_av-1de2393648b9fe43977ef88b72489fec05d629a9.zip frameworks_av-1de2393648b9fe43977ef88b72489fec05d629a9.tar.gz frameworks_av-1de2393648b9fe43977ef88b72489fec05d629a9.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 'drm')
0 files changed, 0 insertions, 0 deletions