OSDN Git Service

Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code." into mnc-dev...
authorSanket Padawe <sanketpadawe@google.com>
Thu, 10 Aug 2017 05:04:05 +0000 (05:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 10 Aug 2017 05:04:05 +0000 (05:04 +0000)
am: 009637231d  -s ours

Change-Id: I6f04c1d55bd55c1e46b9c320bb82ac798a6589d8


Trivial merge