OSDN Git Service

Backport changes to whitelist sockets opened by the zygote. am: 0f6a0e1560 -s ours...
authorNarayan Kamath <narayan@google.com>
Thu, 8 Sep 2016 08:57:49 +0000 (08:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Sep 2016 08:57:49 +0000 (08:57 +0000)
am: 5556367bc1

Change-Id: Ib0ff7e81f890d162c0b8000ce9894ef988f188da


Trivial merge