tree 2f1366692fdc78fcb2f7de75407d3e461ba77b4c
parent 8778a131c2f639f1ed490d7847cf544cddc33e80
parent 2188ad799ebfdf4d9d6bd5e5d185d9562ea42b48
author Fabien Sanglard <sanglardf@google.com> 1486066363 +0000
committer android-build-merger <android-build-merger@google.com> 1486066363 +0000

Merge "Fix security vulnerability" into nyc-dev
am: 2188ad799e

Change-Id: Iac558b8fedbbfdd76ebe90867b70d57c33f8b644