OSDN Git Service

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

Change-Id: I6b36c03974b28612a89f55f3fc6c6e98a6169b3b


Trivial merge