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