tree 8f3e1bbbbb80682e9addd843288e1c6fcb4c1f63
parent 7fec6a61266e45a1f4dd1d4dd9f13040db14fd5e
parent 7b5514fd2be28aa986922357e460f520435362ba
author Narayan Kamath <narayan@google.com> 1473325584 +0000
committer android-build-merger <android-build-merger@google.com> 1473325584 +0000

Backport changes to whitelist sockets opened by the zygote. am: 0f6a0e1560  -s ours am: 6fa8339792 am: c6ced086d1 am: 4474da7b7c am: 5556367bc1
am: 7b5514fd2b

Change-Id: Iad04d9353d319cef0a30d3c40a9baad68bc88ba6