commit | 3ad66e40b2df137f5ed6b8c1d58f399f07d28f6a | [log] [tgz] |
---|---|---|
author | Narayan Kamath <narayan@google.com> | Thu Sep 08 09:18:27 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 09:18:27 2016 +0000 |
tree | 890a22e8ea867caceb2dbe257fc5b45113c99aff | |
parent | c79df075f48dfabc80b4f2e3ccd10c863da50534 [diff] | |
parent | 7fec6a61266e45a1f4dd1d4dd9f13040db14fd5e [diff] |
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am: 459810b9b7 am: 47b88a15f6 am: 7a0c7ab520 am: 45d7b8dd2a am: 2d58d83f86 am: 7fec6a6126 Change-Id: I16879ce9a483c31cbfa94299498436c4c90d91dd