tree 640eae42d9e4191b425679a0147c304724bc148f
parent b4132e013747c329e5a157495fc7c3625b4ca503
parent 3abb451f70438fc7d5ff75999fd922c243e408e9
author Chad Brubaker <cbrubaker@google.com> 1440707832 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440707832 +0000

am 3abb451f: am f86c0757: (-s ours) am fc608967: am d98db140: Merge "Fix benign unsigned overflow in OggExtractor"

* commit '3abb451f70438fc7d5ff75999fd922c243e408e9':