OSDN Git Service

Merge "Fix security vulnerability" into nyc-dev am: 2188ad799e am: 80672db6b8
authorFabien Sanglard <sanglardf@google.com>
Thu, 2 Feb 2017 20:18:25 +0000 (20:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 2 Feb 2017 20:18:25 +0000 (20:18 +0000)
am: 900cd6a1d2

Change-Id: Ieee74bcd82513fc4612c874b966ba9903e26565c


Trivial merge