tree 1594f52e8785f51ef5fc9ced67cbbe9c669b1f0e
parent fc89da3045fd3efee3743c9729640829e216e44b
parent 3fcdb62da4557562d3188e2f037e0b215bb7acf7
author Narayan Kamath <narayan@google.com> 1473281910 +0000
committer android-build-merger <android-build-merger@google.com> 1473281910 +0000

Backport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f84f87 am: 9a409265fc  -s ours am: 9802fcfa2b am: 2acf9f7e3c am: 36b90a1934 am: 5febcdd210 am: ebcc7aeda9 am: f52b30cf8d am: a2112ae2a0
am: 3fcdb62da4

Change-Id: I89d826e50d731706bbe39b8da9d1bf4beab0d38a