tree 82047cd87e1a32e0b72ae0f274c844164f816172
parent 77d00533f00013b20f2fd96d6cdbe4398f374e17
parent 16cb432a41dfd9869972360b868fbc85830c0412
author Wei Jia <wjia@google.com> 1440101430 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440101430 +0000

am 16cb432a: am 1e97d490: am 7c6a8141: am e4bcb3f8: am 238a487a: am e3cb2507: am 4b995f73: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into lmp-dev

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