tree b443bf98b8899119c9d7993a5340aa1c411bd083
parent 0afecdebaea1982ead120a701ddd24f2b0ff3897
parent 0d46c93785e2c426be11172bec0489b698fea6c3
author Jon Larimer <jlarimer@google.com> 1439908285 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439908285 +0000

am 0d46c937: Merge "MPEG4Source::fragmentedRead: check range before writing into buffers" into klp-dev

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