Skip to content
Commit 4407f375 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 nyc-dev 

am: 15ab5393

Change-Id: I38d078326cae81c96e240b8a6c03f4a1289e94ea
parents 94e09df4 15ab5393
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