tree bcdddf48ac422375ad01c533be22d99a356fb1e8
parent 0b82e86c707899ef93cbfebb902d7760fab4e918
parent a5ca50ac808061983fd7af39eed9b006237d925a
author Nick Kralevich <nnk@google.com> 1440036294 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440036294 +0000

am a5ca50ac: am 75d3927a: am 23565920: am a598bac2: am a3a29952: am 4b153ff9: am 2f3c04a4: resolved conflicts for merge of 6035c811 to lmp-dev

* commit 'a5ca50ac808061983fd7af39eed9b006237d925a':
  MPEG4Source::fragmentedRead: check range before writing into buffers