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)
am: 15ab539368

Change-Id: I38d078326cae81c96e240b8a6c03f4a1289e94ea


Trivial merge