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

Change-Id: I78adbdbbf8ffddfee3cd8b1407415cdf3a4d1b1f
parents 8cb6b933 24ffc9ab
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