tree 873ec2ac2742b801a1f92e9c9770202a3284a905
parent 020c15b763345e237c0df79e638d94dc0b6f9de8
parent a549658bb6eca9dd0dbd9f3c6fb2911dda127e65
author Wei Jia <wjia@google.com> 1435700946 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435700946 +0000

am a549658b: am 7397892d: am 402eaab9: am 370290f4: am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when processing covr MPEG4 atoms" into klp-dev

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