tree ada53d3295c52ec1584c7a61779ec0d3a42b5e2d
parent d3b6f9c17ed10df01d682b0fac6b13fca396e5fb
parent 9b6d24269de06a6ba819645d80c6a85c9cee903a
author Wei Jia <wjia@google.com> 1440094503 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440094503 +0000

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

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