tree cf9fed3a45827c1b17e214957ed8e5f5c2133cf1
parent 2fd79fa39a0ec347a80ceb5b056ed5053002f59e
parent d7c205fe1f7cda2cdcb3062b548c0777402bab38
author Wei Jia <wjia@google.com> 1440093068 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440093068 +0000

am d7c205fe: am 522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into klp-dev

* commit 'd7c205fe1f7cda2cdcb3062b548c0777402bab38':
  libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.