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