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