From: Fabien Sanglard <sanglardf@google.com>
Date: Thu, 2 Feb 2017 20:18:25 +0000 (+0000)
Subject: Merge "Fix security vulnerability" into nyc-dev am: 2188ad799e am: 80672db6b8
X-Git-Tag: android-x86-7.1-r1~20^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c1038b66dd;p=android-x86%2Fframeworks-native.git

Merge "Fix security vulnerability" into nyc-dev am: 2188ad799e am: 80672db6b8
am: 900cd6a1d2

Change-Id: Ieee74bcd82513fc4612c874b966ba9903e26565c
---

c1038b66dddb28ca1d3a1b6fc12f433c5a852128