OSDN Git Service

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

Change-Id: Icf63eb65d60fd04c5209c1cb40ec2134db3e2356


Trivial merge