tree 20b7bd43e71f6111cda2066b0e885965c39eabdc
parent 2fadaf5634cb3e41aea09a24fee99f0e2afa00b3
parent 4bbdf934458253dbdb331d2b614a085256ba8d6c
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.