From: Jean-Baptiste Queru <jbq@google.com>
Date: Mon, 1 Aug 2011 21:10:39 +0000 (-0700)
Subject: am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefright: Return error... 
X-Git-Tag: android-x86-4.4-r1~3915^2~23
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2f7b9bf2d1d65a70fc0d0b2281ca765e0619b44d;p=android-x86%2Fframeworks-native.git

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.
---

2f7b9bf2d1d65a70fc0d0b2281ca765e0619b44d