| commit | 4912d73eb9c13fa0f59cb6f8b8cb009c102e22ab | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Aug 27 20:36:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:36:03 2015 +0000 |
| tree | 640eae42d9e4191b425679a0147c304724bc148f | |
| parent | bddba5f505d4bf017600554b59b573cdc296d078 [diff] | |
| parent | 80534c74b96acf208be9656a43d068ebd07742c2 [diff] |
am 80534c74: am 2c9e95e9: (-s ours) am 01afbf07: am fbac8266: am a205e4ae: am 9b6d2426: am bd96da22: am b53cdf49: am d7c205fe: am 522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into klp-dev * commit '80534c74b96acf208be9656a43d068ebd07742c2':