OSDN Git Service

Merge "Merge "Fix security vulneratibly 31960359" into nyc-dev am: fefc4f4e94 am...
authorFabien Sanglard <sanglardf@google.com>
Tue, 6 Dec 2016 19:46:20 +0000 (19:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Dec 2016 19:46:20 +0000 (19:46 +0000)
am: b7573c1654

Change-Id: I28b2302efdba39fe95b874a61c636c159122b448


Trivial merge