| commit | 1de2393648b9fe43977ef88b72489fec05d629a9 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 01 14:10:39 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 01 14:10:39 2011 -0700 |
| tree | 8136f77079960d466a895235d601d97d258a4f06 | |
| parent | b2ac59b3a1748eef58c228a7e808d40bd1741dcf [diff] | |
| parent | 93a1e245c94f14b6fb68361f76e46285431dab26 [diff] |
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.