OSDN Git Service

am 2f3c04a4: resolved conflicts for merge of 6035c811 to lmp-dev
authorNick Kralevich <nnk@google.com>
Tue, 18 Aug 2015 18:23:42 +0000 (18:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Aug 2015 18:23:42 +0000 (18:23 +0000)
commit4b153ff9b5c979684ed0a53d52a3ad90ec7f7d22
tree8eaf42277d9da24f6be6e4cd26c3dee67f8b56f2
parent484ebc81263a627b5e24e65373ab0752996ca0c8
parent2f3c04a4e92aabea09325cd6870d74a705d98dd8
am 2f3c04a4: resolved conflicts for merge of 6035c811 to lmp-dev

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