tree 6fa556e35b554c51588deaf54645478287e11182
parent 7aba7234e13dc1ce28f5314ced22f838e5cf6a8b
parent e9295560cfb29b17f58bb16834f5d3bad45254ae
author Narayan Kamath <narayan@google.com> 1473417894 +0000
committer android-build-merger <android-build-merger@google.com> 1473417894 +0000

Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am: 00e808b06b am: e59073096e am: 24ffc9ab47 am: bd6a29cddc
am: e9295560cf

Change-Id: Ib64b8f7e777a5779ef7b057cb55bf1b8148e2fa5