| commit | 2fd160b0d4107664529bac291708c67a5518d207 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Sep 09 11:01:19 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 09 11:01:19 2016 +0000 |
| tree | ef2fd2e8787c502145672c5784f3096d161163d8 | |
| parent | 7a4882a8959cc88e1c589e692aadf2c0702d765b [diff] | |
| parent | 2e8b25701a74b0a2950af4851053e134d7cc14e2 [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: 2e8b25701a Change-Id: If0cc333a2fa6bfadc0d4ac56049dc14e7066e38c