OSDN Git Service

am 94012bc3: am ffe509ff: am d0af1ded: (-s ours) am a421314f: am 430475da: resolved...
authorNick Kralevich <nnk@google.com>
Fri, 7 Aug 2015 17:44:01 +0000 (17:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Aug 2015 17:44:01 +0000 (17:44 +0000)
* commit '94012bc3068816adf348bac7b1ffd477c6e34600':
  Prevent integer overflow when processing covr MPEG4 atoms


Trivial merge