tree 2e0665e3f3562d0b9e44a3b04bd6c966d4350cba
parent dbc5afe3f1a2139faf34a1f93bcde2580d385f3b
parent 94e09df49b2a7243d61bdd723ed639ae5ff282d7
author Narayan Kamath <narayan@google.com> 1473321176 +0000
committer android-build-merger <android-build-merger@google.com> 1473321176 +0000

Backport changes to whitelist sockets opened by the zygote. am: a1252ccbdb
am: 94e09df49b  -s ours

Change-Id: Ie7ccb210c84177c9bb95bf402716e1a85e4e7882