commit | db3399a68e01a9a6ca9e449b4b7bfe6a9a65cf11 | [log] [tgz] |
---|---|---|
author | Narayan Kamath <narayan@google.com> | Thu Sep 08 07:57:51 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 07:57:51 2016 +0000 |
tree | 06be80bc44b0029c2e97681f2d71a92be8462e08 | |
parent | a5ffff55f6947184f9aa268ecba734787a78932a [diff] | |
parent | c60f54edfb719fa8a31e842c46cf63dff8841cad [diff] |
Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev am: 15ab539368 am: d18881d4f8 am: c60f54edfb Change-Id: Ifeda9eb2d6daf0a814fe10c677e3cf88fce17cab