commit | d18881d4f8e535ba9a1789e00be8364ce4c6a63c | [log] [tgz] |
---|---|---|
author | Narayan Kamath <narayan@google.com> | Thu Sep 08 07:47:24 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 07:47:24 2016 +0000 |
tree | 473f829f9c3a65d401d88cac45eadbcb7feb80a4 | |
parent | abd5b05190e00660ecb88dc551aac1af613b2921 [diff] | |
parent | 15ab53936812ec522f327081b99ec5582de49545 [diff] |
Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev am: 15ab539368 Change-Id: I88c0fde563218de25fb0fa9a6bd29abf0df44212