| commit | 23565920c34c8163520342c4906b52a0e20aeb67 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu Aug 20 01:16:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 01:16:25 2015 +0000 |
| tree | 9aa86e47a37a2f424872b57eb5ee3bdc55a822d7 | |
| parent | c5a1824fce1228ed93aef4d3abe34ffeffd9e663 [diff] | |
| parent | a598bac211012fa1b4bd603f47755781ffb2e38c [diff] |
am a598bac2: am a3a29952: am 4b153ff9: am 2f3c04a4: resolved conflicts for merge of 6035c811 to lmp-dev * commit 'a598bac211012fa1b4bd603f47755781ffb2e38c': MPEG4Source::fragmentedRead: check range before writing into buffers