| commit | a0abd73bc98395793b817ecec6656eea2aad080f | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Sep 08 09:21:44 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 09:21:44 2016 +0000 |
| tree | 4918b2a1ba7bff98ec9eda04536c6b280fe6cf72 | |
| parent | cdc2842cfc0b2d3fa9382379764f01c9216a1e42 [diff] | |
| parent | f04f3892fb1436d234cc8fc10ef6080ecd3a8fd3 [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 Change-Id: I1bfdbef0c8df640d64cdb77cdccc51d38bb75186