tree 45bb87df52ffb982f978adaafa3e29e83a6d8488
parent 5556367bc120e6c3381c2b8e0d71f5138fe232ca
parent 177ee386b9736e6cda34b1d838aaf91ecdc8f5bd
author Narayan Kamath <narayan@google.com> 1473325508 +0000
committer android-build-merger <android-build-merger@google.com> 1473325508 +0000

Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am: 014016cf32 am: 447d3798f1 am: 71e6a6f12a
am: 177ee386b9

Change-Id: Ic7a1d8c1ba996024b02915e431f2b7aacc306225