OSDN Git Service

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

Change-Id: Ieb4399ba0740fe711ab4459a7a196d58df111c2b


Trivial merge