| commit | 7fec6a61266e45a1f4dd1d4dd9f13040db14fd5e | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Sep 08 09:06:19 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 09:06:19 2016 +0000 |
| tree | 8f3e1bbbbb80682e9addd843288e1c6fcb4c1f63 | |
| parent | 97405e2f262bf4b0bfb63ce7de0eae51243c046a [diff] | |
| parent | 2d58d83f86e0fd07701b45cc99e665ba662265b7 [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 Change-Id: I1f7e6a307a49915e1078216ad8e787172c2f0287