| commit | f777e4ecedcdbaadac8510acc181a9aa698758a6 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Sep 08 09:30:30 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 09:30:30 2016 +0000 |
| tree | 890a22e8ea867caceb2dbe257fc5b45113c99aff | |
| parent | 48845b8bda85ed9a2f8d5ba2757e06177e49c412 [diff] | |
| parent | c1121954d53cc07b1813d41235f4584f98d395d9 [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 am: c1121954d5 Change-Id: Id1c85178ccbb46185cd26526c5789758c909eda8