| commit | eea9d426e340f8ff988755e1d724b4bb76bf3184 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Sep 09 11:21:49 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 09 11:21:49 2016 +0000 |
| tree | f31d942a1e05079e71fe63e77b722b73387f4a12 | |
| parent | 2538cf023ba83d32723a3af2a5a354c1e17e7f8e [diff] | |
| parent | 8399028eba5d2861f8057d61e2cb26d754649c11 [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 am: 2fd160b0d4 am: 6462be90a8 am: 8399028eba Change-Id: Id64f60a7887aa8518d0f4e369d701b57fcf572cd