tree 89a03d029b9a31b8c45741279198f976304a6ebc
parent 5884468b448a5e2810d2ae421b69cc9c18a1a2f5
parent 44e15c44ad10b36bd3649b21ea7432348e2f05f8
author Andreas Huber <andih@google.com> 1259019566 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259019566 -0800

am 44e15c44: Some playable/decodable streams have been found in the wild that violate this assertion, let\'s be lenient for now.

Merge commit '44e15c44ad10b36bd3649b21ea7432348e2f05f8' into eclair-mr2-plus-aosp

* commit '44e15c44ad10b36bd3649b21ea7432348e2f05f8':
  Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now.