Skip to content
Commit 6462be90 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

Change-Id: I581ede714b9d431b6438117f636538da35ac59b2
parents c0e2b237 2fd160b0
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