| commit | a5d3cf49eefa8a9ef7d41dd9bad75e64e478f249 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Sep 08 08:02:55 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 08:02:55 2016 +0000 |
| tree | 2e0665e3f3562d0b9e44a3b04bd6c966d4350cba | |
| parent | 9eb05c8c84df2f70f117b0daefc205e66cd87b50 [diff] | |
| parent | db3399a68e01a9a6ca9e449b4b7bfe6a9a65cf11 [diff] |
Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev am: 15ab539368 am: d18881d4f8 am: c60f54edfb am: db3399a68e Change-Id: I856df8feb36086ca4651e5d8b0bde8ebf986700e