commit | 447d3798f10e22609b1d30c30a5774902c95e121 | [log] [tgz] |
---|---|---|
author | Narayan Kamath <narayan@google.com> | Thu Sep 08 08:30:41 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 08:30:41 2016 +0000 |
tree | bd404b98eb13a6f123559c7f3e8653f78d57dea0 | |
parent | 6fa83397924f48fff2b7be6cf98bd4e376d0e66e [diff] | |
parent | 014016cf32fcac77c71acfae644755b4690f5ba8 [diff] |
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am: 014016cf32 Change-Id: Ic0cf8b5cc2accaad552b82eaadce359e21e5e624