OSDN Git Service

Merge "Add a whitelist of sockets on fork." into nyc-mr1-dev
authorNarayan Kamath <narayan@google.com>
Wed, 31 Aug 2016 08:20:09 +0000 (08:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 31 Aug 2016 08:20:09 +0000 (08:20 +0000)
am: f7d8a1648b

Change-Id: I04d1f7a6ddf5d9355e124656e82845b68e2df7cc


Trivial merge