commit 31eb1ac1db38d0a5cd0b44dd5251941992f74b58
author Andreas Huber <andih@google.com> Wed Aug 18 13:38:49 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 18 13:38:49 2010 -0700
tree bd58a7b9e74293b91ce76de008c44846de1c0006
parent 0899e8bc9dc44249d6be016bed71a9ecee56f132
parent 0324ce9a1e21ed66e00d6560c27a6faf6d151f68

am 0324ce9a: Merge "Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us." into gingerbread

Merge commit '0324ce9a1e21ed66e00d6560c27a6faf6d151f68' into gingerbread-plus-aosp

* commit '0324ce9a1e21ed66e00d6560c27a6faf6d151f68':
  Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us.