| commit | c60f54edfb719fa8a31e842c46cf63dff8841cad | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Sep 08 07:52:59 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 07:52:59 2016 +0000 |
| tree | f196eda02a3d14f59e1501fda9dc09bd45cd9db8 | |
| parent | 96eb99506b39819561fcc219e4dd16db2bd75d03 [diff] | |
| parent | d18881d4f8e535ba9a1789e00be8364ce4c6a63c [diff] |
Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev am: 15ab539368 am: d18881d4f8 Change-Id: Id755f9a0a2854f874f852eddeaf129e59bb15838