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)
commit61934fafa7e68c2adbf50412c3d524ea5ec4ed1d
tree4c849a3d50faeedaaf929ba26e95d3b6607a14d1
parentc570778430a22b5488cae72982cf9fb8033dbda3
parent94012bc3068816adf348bac7b1ffd477c6e34600
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 '94012bc3068816adf348bac7b1ffd477c6e34600':
  Prevent integer overflow when processing covr MPEG4 atoms