tree 7f318f411f155df1408889f78ec9955dc9933f86
parent 2089e592ba48b5dadca579ac40afe3142c4de316
parent c0e2b2377abe5b7e8ae3e6b3290a83ac78ee67fa
author Narayan Kamath <narayan@google.com> 1473419452 +0000
committer android-build-merger <android-build-merger@google.com> 1473419452 +0000

Backport changes to whitelist sockets opened by the zygote. am: 82c6e6267e  -s ours am: 646ee94421 am: 8f0cc3dd13 am: 8cb6b9335c am: eb972e5d9d am: 7aba7234e1 am: d1697846ba am: 7a4882a895
am: c0e2b2377a

Change-Id: I8ad2148d731848eed3ac479a6943aee2ed72f9ae