| commit | a3422bcbef5fe5744aa99a9fdf3ff10837e925a4 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Sep 08 08:07:51 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 08:07:51 2016 +0000 |
| tree | 84a96509b2e92ff84a0de664a8dfc09e1f3e4521 | |
| parent | a85611796aeed23fd7814e5569dd942d41046c50 [diff] | |
| parent | a5d3cf49eefa8a9ef7d41dd9bad75e64e478f249 [diff] |
Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev am: 15ab539368 am: d18881d4f8 am: c60f54edfb am: db3399a68e am: a5d3cf49ee Change-Id: Ic6826d115b430e8f3142c61cda894d53ca8ff2b2