commit | c1121954d53cc07b1813d41235f4584f98d395d9 | [log] [tgz] |
---|---|---|
author | Narayan Kamath <narayan@google.com> | Thu Sep 08 09:21:51 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 09:21:51 2016 +0000 |
tree | 8f3e1bbbbb80682e9addd843288e1c6fcb4c1f63 | |
parent | b81042db6f764ba9c90d502c8b7e6e2d0be71e40 [diff] | |
parent | 1ed0010f95a5c7930059e0d42afe128d1cc41c15 [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: 1ed0010f95 Change-Id: Ife729bd1af2fab2180f8619d47e5fd996e954481