tree 7f5c9ea6c0463b2580f380b9e6d298837d3a62bd
parent 3b7ca5d1a28c6b20480a9854e519ab8d61cfa496
parent 4c0569ee5ed287cb2a7f676dd9ec742bbcb63456
author Joshua J. Drake <android-open-source@qoop.org> 1438970791 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438970791 +0000

am 4c0569ee: am 38b7324c: am 437d47cb: am f13cc52d: am 8e0e43d2: am 3621c056: am bcc8e581: am bb99a362: am 8d60fc3e: am 338bbf53: am fd334e34: am 03d539a7: am a5b9055d: am f1ce97dd: Fix integer overflow when handling MPEG4 tx3g atom

* commit '4c0569ee5ed287cb2a7f676dd9ec742bbcb63456':
  Fix integer overflow when handling MPEG4 tx3g atom