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

am: e59073096e

Change-Id: Ifb7972c30d70a0fbc4ffdae100aac2d77ca445ca
This commit is contained in:
Narayan Kamath
2016-09-09 10:28:52 +00:00
committed by android-build-merger

Diff Content Not Available