tree a0a5440f0af7b92d91b9c4a008ee9439f71f9e0c
parent 343f9c81f293f56e09b1cc1921844ecd3372e435
parent 7013209cdf393b3d958ddd46ed50394349378826
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