| commit | 24ffc9ab47f5f9f2afbec43f05b3423c7b01e37b | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Sep 09 10:28:52 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 09 10:28:52 2016 +0000 |
| tree | bd404b98eb13a6f123559c7f3e8653f78d57dea0 | |
| parent | 8f0cc3dd1329d3b386af1eea6470556540671561 [diff] | |
| parent | e59073096e7f106b420cd49c2250c3218a0b347d [diff] |
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am: 00e808b06b am: e59073096e Change-Id: Ifb7972c30d70a0fbc4ffdae100aac2d77ca445ca