OSDN Git Service

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

Change-Id: I762872d37503d88cae375a58ff9b4f1c24828807


Trivial merge