tree 82c07cbbcbc82981577834ad2087b1a99c1f0645
parent 108d0898ea34ba106af26c6acb2b9b16ca23773a
parent d200c4e9385ac0c3eb008b60c6314931b143b9d3
author Jean-Michel Trivi <jmtrivi@google.com> 1545855389 -0800
committer android-build-merger <android-build-merger@google.com> 1545855389 -0800

Merge "Unsigned Integer Overflows in mpegSurroundDecoder_Parse()." am: e8b5674a5f
am: d200c4e938

Change-Id: I8cb790054357f6c9d81e5b327fabb421d9479ebb