Skip to content
Commit 804e0e98 authored by Narayan Kamath's avatar Narayan Kamath Committed by android-build-merger
Browse files

Merge "Backport changes to whitelist sockets opened by the zygote." into... 

Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am: 00e808b0 am: e5907309 am: 24ffc9ab am: bd6a29cd am: e9295560 am: 19ebec6d am: aa9d4135
am: 2089e592

Change-Id: I1e4b69e9acb6410ca89cd6f2cd4df08ed8719d10
parents 948174d4 2089e592
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment