| commit | 1ed0010f95a5c7930059e0d42afe128d1cc41c15 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Sep 08 09:16:14 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 09:16:14 2016 +0000 |
| tree | 0519b11b8a264baf40a6db174571354f626b1fde | |
| parent | 7b5514fd2be28aa986922357e460f520435362ba [diff] | |
| parent | b126d7c7c57f92287ec8b47c977524d4e81399b8 [diff] |
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am: 014016cf32 am: 447d3798f1 am: 71e6a6f12a am: 177ee386b9 am: b126d7c7c5 Change-Id: I1a22c2863405a477628807c835ef618a83519def