am 6c07ac8f: am 45b821df: am ef426568: am 3b7ca5d1: am efc51f0f: am 93a8df0e:...

am 6c07ac8f: am 45b821df: am ef426568: am 3b7ca5d1: am efc51f0f: am 93a8df0e: am 61934faf: am 94012bc3: am ffe509ff: am d0af1ded: (-s ours) am a421314f: am 430475da: resolved conflicts for merge of 0b3eca88 to jb-mr1-dev-plus-aosp

* commit '6c07ac8f':
  Prevent integer overflow when processing covr MPEG4 atoms