OSDN Git Service

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

Change-Id: Ic7a1d8c1ba996024b02915e431f2b7aacc306225


Trivial merge