tree bc1c3b480bfb9a1a29a3c9f0c4741648d340ea8f
parent fcc6d852b6efb93c1f189399446e4219578cc311
parent 35c96b589ed8095a0d3a7dfd166b40180c0cf84c
author Andreas Huber <andih@google.com> 1353432265 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353432265 -0800

am 7013209c: Merge "Handle large AVCC chunks"

* commit '7013209cdf393b3d958ddd46ed50394349378826':
  Handle large AVCC chunks