OSDN Git Service

Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev...
authorNarayan Kamath <narayan@google.com>
Thu, 8 Sep 2016 08:57:44 +0000 (08:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Sep 2016 08:57:44 +0000 (08:57 +0000)
am: 45d7b8dd2a

Change-Id: I07c03beef5044d020390108eadc995f443d6ae9b


Trivial merge