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)
commit666c7ae3e4a124b1f4888acc7feb57db33b9db74
treef199a4a0adca1126df7457c4c87cff6b43f3aee5
parent3f58724a467bad50880ba9f58ef5c14c7c4e5f21
parentf7d8a1648bb18402ddb914801e9bcccf45e89345
Merge "Add a whitelist of sockets on fork." into nyc-mr1-dev
am: f7d8a1648b

Change-Id: I04d1f7a6ddf5d9355e124656e82845b68e2df7cc