tree 7bfb939ee369516f1aeade7d4b5319ebe35061dd
parent 0f7ae8601cef080fd87345c980834f9a4c87059b
parent 466adf2a1b74e4ec204e4852c18d8a5267dd5e38
author Jean-Michel Trivi <jmtrivi@google.com> 1545876501 -0800
committer android-build-merger <android-build-merger@google.com> 1545876501 -0800

Merge "Unsigned Integer Overflow in CAacDecoder_PreRollExtensionPayloadParse()" am: a5cf260931
am: 466adf2a1b

Change-Id: I354fe7ee0401e1e154ae42ce9a80672db8a84d08