tree 4c5b82a893f355d77a198904d0b26081a406be81
parent 485d02df7368ab2fea4da170d5087d0eea95722a
parent a5cf260931f577091554fb1ad8cdee97994b55f9
author Jean-Michel Trivi <jmtrivi@google.com> 1545876207 -0800
committer android-build-merger <android-build-merger@google.com> 1545876207 -0800

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

Change-Id: Ib3c4c335ef6bbfdccd4db91b03f5f0cdde7705a3