tree 2e0665e3f3562d0b9e44a3b04bd6c966d4350cba
parent 9eb05c8c84df2f70f117b0daefc205e66cd87b50
parent db3399a68e01a9a6ca9e449b4b7bfe6a9a65cf11
author Narayan Kamath <narayan@google.com> 1473321775 +0000
committer android-build-merger <android-build-merger@google.com> 1473321775 +0000

Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev am: 15ab539368 am: d18881d4f8 am: c60f54edfb
am: db3399a68e

Change-Id: I856df8feb36086ca4651e5d8b0bde8ebf986700e