tree 45bb87df52ffb982f978adaafa3e29e83a6d8488
parent bdbed7857b55cf9f0aa7b8e5035e88d73f005697
parent a1252ccbdbae686cb41e7efba769c4935f664220
author Narayan Kamath <narayan@google.com> 1473319843 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1473319846 +0000

Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev