OSDN Git Service

Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev
authorNarayan Kamath <narayan@google.com>
Thu, 8 Sep 2016 08:30:41 +0000 (08:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Sep 2016 08:30:41 +0000 (08:30 +0000)
commit447d3798f10e22609b1d30c30a5774902c95e121
treebd404b98eb13a6f123559c7f3e8653f78d57dea0
parent6fa83397924f48fff2b7be6cf98bd4e376d0e66e
parent014016cf32fcac77c71acfae644755b4690f5ba8
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev
am: 014016cf32

Change-Id: Ic0cf8b5cc2accaad552b82eaadce359e21e5e624