tree 91db16bef8edae976bd9feedc1260e18d9cd65f5
parent 47b81de1b7876cdafbc092e51e4946eca57e650f
parent 0c0fc8557f2060cdb196859f618febe55b611f21
author Narayan Kamath <narayan@google.com> 1473276113 +0000
committer android-build-merger <android-build-merger@google.com> 1473276113 +0000

Backport changes to whitelist sockets opened by the zygote. am: 63545150c2 am: 3ca7daccf5 am: 7f0598bc4f  -s ours am: d210ab92a8 am: 004a7427da am: 4b63812661 am: a1be6fdba8 am: e05b517d3e am: 73a7177d7b am: d215dbe93d am: d5138b5811 am: e68d727219 am: 7cf4f6727e
am: 0c0fc8557f

Change-Id: Id03b056d5275466dfe4a985fb5c13406af60cd25