| commit | 804e0e9866b961ea20de978419ef423eac71ff9e | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Sep 09 11:11:40 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 09 11:11:40 2016 +0000 |
| tree | f31d942a1e05079e71fe63e77b722b73387f4a12 | |
| parent | 948174d4e379b6abe85a65ad51e8b08e8ba549c3 [diff] | |
| parent | 2089e592ba48b5dadca579ac40afe3142c4de316 [diff] |
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am: 00e808b06b am: e59073096e am: 24ffc9ab47 am: bd6a29cddc am: e9295560cf am: 19ebec6d36 am: aa9d4135e2 am: 2089e592ba Change-Id: I1e4b69e9acb6410ca89cd6f2cd4df08ed8719d10