| commit | c3002713e10f583f87d8fa3efc49215ae16b0479 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Sep 08 07:53:01 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 07:53:01 2016 +0000 |
| tree | 2e0665e3f3562d0b9e44a3b04bd6c966d4350cba | |
| parent | 7f38322ab245513d06ae767eff7e71d13aede45c [diff] | |
| parent | 4407f375a0613c19145e0596463ca9552a41ce42 [diff] |
Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev am: 15ab539368 am: 4407f375a0 Change-Id: I9ab51ab126d2b7b288481ae90ef2dfdbe3edbf18