OSDN Git Service

am 8fb7bd4d: am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefright...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 1 Aug 2011 21:12:43 +0000 (14:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Aug 2011 21:12:43 +0000 (14:12 -0700)
commit880c6378ff5bb1362cf0617cbfd5266425e8d6c8
tree37fc3cd72c05d8b13eba161a1a86b3d0899e828f
parentd01002ef74782aced60165ca0478d8a4576166bd
parent2f7b9bf2d1d65a70fc0d0b2281ca765e0619b44d
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.