| commit | 7a37451fc8640323ebe869035374418c07b73b9e | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Sep 08 09:25:33 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 09:25:33 2016 +0000 |
| tree | 8f3e1bbbbb80682e9addd843288e1c6fcb4c1f63 | |
| parent | c1121954d53cc07b1813d41235f4584f98d395d9 [diff] | |
| parent | 90529e01324602a7bece5d37f8ff30dd54f998e7 [diff] |
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am: 459810b9b7 am: 47b88a15f6 am: 7a0c7ab520 am: 45d7b8dd2a am: c83ca7267a am: edabef5738 am: 90529e0132 Change-Id: Ie36b35581893a4de7952ec36778422f0eb6f1686