tree fee49df3b7f4afa8ed11547c32a266ba9260392d
parent a129f9b2662114c59b63a7b2d2a7266ce10bc29a
parent 6acfe3b799e0b030fb807e1a92a8b0a507b0207d
author Jean-Michel Trivi <jmtrivi@google.com> 1546038694 -0800
committer android-build-merger <android-build-merger@google.com> 1546038694 -0800

Merge "Fix potential invalid memory access for concealment in decodeEnvelope()"
am: 6acfe3b799

Change-Id: I076520b4a8a40ade304d22f0b0a408de3734ac9a