| commit | 45d7b8dd2a2075d31051f14288576d718ab026bd | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Sep 08 08:48:31 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 08:48:31 2016 +0000 |
| tree | 45bb87df52ffb982f978adaafa3e29e83a6d8488 | |
| parent | bf16d345a6c646f382a1f317613575c6256a790a [diff] | |
| parent | 7a0c7ab520610c7ea6875a3679032d94731710af [diff] |
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am: 459810b9b7 am: 47b88a15f6 am: 7a0c7ab520 Change-Id: I0ed385ab13ca461c1b77226d3be3cf788a09d3d6