tree ad4526b1535595df13a88d361e9ca5faba8420d7
parent 84a4221e305847fb0c8846122fe8f2bc7c2fda0a
parent 4b995f73b581ce0705b537317f32ad76bddb55fa
author Wei Jia <wjia@google.com> 1440045105 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440045105 +0000

am 4b995f73: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into lmp-dev

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