tree 4918b2a1ba7bff98ec9eda04536c6b280fe6cf72
parent 6f98f1ac62940dc732451044c0920b26f99c835b
parent c83ca7267a92b7c289afad72283f4ac2c82415f2
author Narayan Kamath <narayan@google.com> 1473325579 +0000
committer android-build-merger <android-build-merger@google.com> 1473325579 +0000

Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am: 459810b9b7 am: 47b88a15f6 am: 7a0c7ab520 am: 45d7b8dd2a
am: c83ca7267a

Change-Id: I3ec8374998a606b98d61a2e6de72b1be2800a4c8