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