tree fdb73533e33f948d6c4195367aa23bdf42358d11
parent 3bbe8817e6dbfcb64ea7a02fa46be533ce5718ab
parent 4b6381266102d307e77b724ea9acd3031a19f6e2
author Narayan Kamath <narayan@google.com> 1473274551 +0000
committer android-build-merger <android-build-merger@google.com> 1473274551 +0000

Backport changes to whitelist sockets opened by the zygote. am: 63545150c2 am: 3ca7daccf5 am: 7f0598bc4f  -s ours am: d210ab92a8 am: 004a7427da
am: 4b63812661

Change-Id: I66d3c5fb138d60c506be7db4532de7978d504e04