| commit | 8399028eba5d2861f8057d61e2cb26d754649c11 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Sep 09 11:17:05 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 09 11:17:05 2016 +0000 |
| tree | 7f318f411f155df1408889f78ec9955dc9933f86 | |
| parent | 77e45b707fe9ac10c51cfa060cb817f582350d91 [diff] | |
| parent | 6462be90a89161f4757d1ac6cd8d3f9d9f19c7c5 [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 Change-Id: I41286a51823d37a28db82a1595633f8d85a75ce4