OSDN Git Service

am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefright: Return error...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 1 Aug 2011 21:10:39 +0000 (14:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Aug 2011 21:10:39 +0000 (14:10 -0700)
commit2f7b9bf2d1d65a70fc0d0b2281ca765e0619b44d
tree42326f0f3d84236a13917882c8d0ee48074faa8c
parent45923cdc112c311f40eea9a0a55f58a51a132cee
parent0581cb268102b3b07009950fbdb9da16dee7361c
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.