| commit | a598bac211012fa1b4bd603f47755781ffb2e38c | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Aug 18 18:35:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 18 18:35:52 2015 +0000 |
| tree | a9f45be2b1a63cd1cc50f762dd0af9d1e625bd53 | |
| parent | ccf0e44889f1d4cf5707081556a8b7b62707d62d [diff] | |
| parent | a3a29952f485cd2ebf521273a7b36aac586451cf [diff] |
am a3a29952: am 4b153ff9: am 2f3c04a4: resolved conflicts for merge of 6035c811 to lmp-dev * commit 'a3a29952f485cd2ebf521273a7b36aac586451cf': MPEG4Source::fragmentedRead: check range before writing into buffers