| commit | 2d58d83f86e0fd07701b45cc99e665ba662265b7 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Sep 08 08:57:44 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 08:57:44 2016 +0000 |
| tree | 0519b11b8a264baf40a6db174571354f626b1fde | |
| parent | 82e2378770055fe119865bfbef2d994b702f1b8e [diff] | |
| parent | 45d7b8dd2a2075d31051f14288576d718ab026bd [diff] |
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am: 459810b9b7 am: 47b88a15f6 am: 7a0c7ab520 am: 45d7b8dd2a Change-Id: I07c03beef5044d020390108eadc995f443d6ae9b