| commit | aeb2314b17d813b671d7166d31beac3846d2c7ff | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Sep 08 09:30:22 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 09:30:22 2016 +0000 |
| tree | 8f3e1bbbbb80682e9addd843288e1c6fcb4c1f63 | |
| parent | 9e67a7e055a53c7a9f7125306844fe241bf58498 [diff] | |
| parent | 213634c4147fa73128bce213dda76ab6867b1788 [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 am: 213634c414 Change-Id: I469326d7c9fa8e68a8a8f4737c332dc72cd23da6