commit 63ce34be624dcc1f55635de7f128fc4e9abbbcbc
author Andreas Huber <andih@google.com> Thu Sep 16 11:39:43 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 16 11:39:43 2010 -0700
tree 488db13a095c1b8af7bc6468dc98376c1bcdf75c
parent 94c6e7e13577c7fc3e342fe70e0b569c4a153ac2
parent 2b9f9821b10a141607da04d914b260ccfe817bed

am 62d4ebc0: 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 '62d4ebc0423831dfd8165d359e5b809f00f60656'

* commit '62d4ebc0423831dfd8165d359e5b809f00f60656':
  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.