tree 82d5f27b69a0ac0e7ca65a75a84e2faf4654049c
parent 8d2d13c4bd1c8e95105fc051dd18e36d9d6f884a
parent f7bc8a8d6e25eaa8881342027409299f047ca411
author Andreas Huber <andih@google.com> 1259021246 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259021246 -0800

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

Merge commit '4bbdf934458253dbdb331d2b614a085256ba8d6c'

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