OSDN Git Service

Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1...
authorNarayan Kamath <narayan@google.com>
Fri, 9 Sep 2016 10:44:54 +0000 (10:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Sep 2016 10:44:54 +0000 (10:44 +0000)
am: e9295560cf

Change-Id: Ib64b8f7e777a5779ef7b057cb55bf1b8148e2fa5


Trivial merge