| commit | 7f53e558d1b138d4b2ec371e961d365ab5a873f6 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Sep 08 07:57:53 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 07:57:53 2016 +0000 |
| tree | 84a96509b2e92ff84a0de664a8dfc09e1f3e4521 | |
| parent | 52dc948bbe5650fa24615c17258be03a7276b1d9 [diff] | |
| parent | c3002713e10f583f87d8fa3efc49215ae16b0479 [diff] |
Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev am: 15ab539368 am: 4407f375a0 am: c3002713e1 Change-Id: I2f63d7713696550c7edffb39a65613a4d4152c34