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