commit 62d4ebc0423831dfd8165d359e5b809f00f60656
author Andreas Huber <andih@google.com> Thu Sep 16 11:36:12 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 16 11:36:12 2010 -0700
tree e32b1eba0ce86a84faf2f26ba05cd8ff51605285
parent a85c4f165137ab360879bd9129259690ab6ac05d
parent 49e1ae22801f5f9e620552ffd205b05a0d89f65f

am 49e1ae22: Merge "Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead." into gingerbread

Merge commit '49e1ae22801f5f9e620552ffd205b05a0d89f65f' into gingerbread-plus-aosp

* commit '49e1ae22801f5f9e620552ffd205b05a0d89f65f':
  Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead.