OSDN Git Service

Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev...
authorNarayan Kamath <narayan@google.com>
Thu, 8 Sep 2016 08:57:46 +0000 (08:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Sep 2016 08:57:46 +0000 (08:57 +0000)
commitc83ca7267a92b7c289afad72283f4ac2c82415f2
tree473f829f9c3a65d401d88cac45eadbcb7feb80a4
parentbeade90fe3c5fbecac725ce747a9f8458f40c23d
parent45d7b8dd2a2075d31051f14288576d718ab026bd
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am: 459810b9b7 am: 47b88a15f6 am: 7a0c7ab520
am: 45d7b8dd2a

Change-Id: I66a02ec7bac220d515fc623dbcd0688b72db37fb