OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 484ebc8 2f3c04a)
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)
* commit '2f3c04a4e92aabea09325cd6870d74a705d98dd8':
  MPEG4Source::fragmentedRead: check range before writing into buffers


Trivial merge
frameworks/av
About OSDN
Find Software
Develop Software
Help