OSDN Git Service

Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev
authorNarayan Kamath <narayan@google.com>
Thu, 8 Sep 2016 07:47:20 +0000 (07:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Sep 2016 07:47:20 +0000 (07:47 +0000)
commit4407f375a0613c19145e0596463ca9552a41ce42
tree0519b11b8a264baf40a6db174571354f626b1fde
parent94e09df49b2a7243d61bdd723ed639ae5ff282d7
parent15ab53936812ec522f327081b99ec5582de49545
Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev
am: 15ab539368

Change-Id: I38d078326cae81c96e240b8a6c03f4a1289e94ea