OSDN Git Service

am 430475da: resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp
authorNick Kralevich <nnk@google.com>
Fri, 7 Aug 2015 16:13:44 +0000 (16:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Aug 2015 16:13:44 +0000 (16:13 +0000)
commita421314f9cc1b061d94a79e2aa1a92916ea4b9bf
tree5b646ab51becb775e3fefe2ff43850bb5cbb064f
parentb0924c631cfccd10c1f95d6ae44c8cd852e14a9f
parent430475da7f0edb86ee6a85378d1583ab07f7f93d
am 430475da: resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp

* commit '430475da7f0edb86ee6a85378d1583ab07f7f93d':
  Prevent integer overflow when processing covr MPEG4 atoms
media/libstagefright/MPEG4Extractor.cpp