OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10ef7f7 a421314)
am a421314f: am 430475da: resolved conflicts for merge of 0b3eca88 to jb-mr1-dev...
authorNick Kralevich <nnk@google.com>
Fri, 7 Aug 2015 16:29:34 +0000 (16:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Aug 2015 16:29:34 +0000 (16:29 +0000)
* commit 'a421314f9cc1b061d94a79e2aa1a92916ea4b9bf':
  Prevent integer overflow when processing covr MPEG4 atoms


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