commit c6a16327328cf04066ce948c3fbad34fdf1fbff4
author Andreas Huber <andih@google.com> Thu May 20 11:14:37 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 20 11:14:37 2010 -0700
tree 6339ed611cdc10909b46591224b1c99651b36ee4
parent cf7d2d50a4b99e6729c02cc2257bd6bd62814c6a
parent 3c16154a3309fe250177d69f3fcd5b6e9a82d1b3

am 3c16154a: am 2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo

Merge commit '3c16154a3309fe250177d69f3fcd5b6e9a82d1b3' into kraken

* commit '3c16154a3309fe250177d69f3fcd5b6e9a82d1b3':
  Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.