| commit | 213634c4147fa73128bce213dda76ab6867b1788 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Sep 08 09:26:08 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 09:26:08 2016 +0000 |
| tree | 75a71a2607e3507672ac435b65dc12d101246dd1 | |
| parent | 3e416ebc9274cd671a4d2f2cb6e21e99f6438e21 [diff] | |
| parent | a0abd73bc98395793b817ecec6656eea2aad080f [diff] |
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am: 014016cf32 am: 447d3798f1 am: 71e6a6f12a am: 177ee386b9 am: b126d7c7c5 am: f04f3892fb am: a0abd73bc9 Change-Id: I53d4ab6584331ab1dd08c6a353a4df17a528604a