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)
commit4946e36a09b13393b1305bb847e6303f657c5379
tree6420dcda0ef46dfe027e366f8b377f866b7b69ae
parent81ffcbfa848e04f4ba97bf7d38a930eddebcaf0e
parent3e3a701e3871d4ebdf3cec22ec0475b3206b38fa
Merge "Merge "Fix security vulnerability" into nyc-dev am: 2188ad799e am: 80672db6b8 am: 900cd6a1d2 am: c1038b66dd am: a27b8d6f0b" into nyc-mr2-dev-plus-aosp
am: 3e3a701e38

Change-Id: I6b36c03974b28612a89f55f3fc6c6e98a6169b3b