commit | 2e8b25701a74b0a2950af4851053e134d7cc14e2 | [log] [tgz] |
---|---|---|
author | Narayan Kamath <narayan@google.com> | Fri Sep 09 10:52:43 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Sep 09 10:52:43 2016 +0000 |
tree | 84d26f06bcd3dfc96bfde9f41e0e54d9f5f3ff2e | |
parent | d1697846baa35b3e3d1ea0a9792945155ae74847 [diff] | |
parent | 19ebec6d36d3f3c3cd674c31db43bfa6b7956d15 [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 Change-Id: Idf28988f014023f04bda3d3ce77a37fc26863469