commit | c83ca7267a92b7c289afad72283f4ac2c82415f2 | [log] [tgz] |
---|---|---|
author | Narayan Kamath <narayan@google.com> | Thu Sep 08 08:57:46 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 08:57:46 2016 +0000 |
tree | 473f829f9c3a65d401d88cac45eadbcb7feb80a4 | |
parent | beade90fe3c5fbecac725ce747a9f8458f40c23d [diff] | |
parent | 45d7b8dd2a2075d31051f14288576d718ab026bd [diff] |
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