| commit | b126d7c7c57f92287ec8b47c977524d4e81399b8 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Sep 08 09:05:08 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 09:05:08 2016 +0000 |
| tree | 45bb87df52ffb982f978adaafa3e29e83a6d8488 | |
| parent | 5556367bc120e6c3381c2b8e0d71f5138fe232ca [diff] | |
| parent | 177ee386b9736e6cda34b1d838aaf91ecdc8f5bd [diff] |
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am: 014016cf32 am: 447d3798f1 am: 71e6a6f12a am: 177ee386b9 Change-Id: Ic7a1d8c1ba996024b02915e431f2b7aacc306225