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.