Skip to content
Commit 8399028e 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: 2e8b2570 am: 2fd160b0
am: 6462be90

Change-Id: I41286a51823d37a28db82a1595633f8d85a75ce4
parents 77e45b70 6462be90
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