tree 3cc80ad0b7a78983dacc940114fa0bbdbc303a90
parent 4961520ea24ce3d1fe6c2f59cafc8b51e47c2fbc
parent c31f5af0b94090835e88a8a7bdde31782133a6d8
author Andreas Huber <andih@google.com> 1274379388 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274379388 -0700

am c6a16327: 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