tree f32bbc8c524e337f266f928a4145dc2b2192a6d8
parent f04d154c74d0cd70d400834020ccab3238e0af78
parent 3d9793633e2a5077735b283a20ae826641a6af31
author Jean-Michel Trivi <jmtrivi@google.com> 1546039070 -0800
committer android-build-merger <android-build-merger@google.com> 1546039070 -0800

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

Change-Id: Iba356069f8d51e6a2afd199f62b84867dd34902e