commit | 71e6a6f12acf18e0cd1623b9b977ba410b4d1270 | [log] [tgz] |
---|---|---|
author | Narayan Kamath <narayan@google.com> | Thu Sep 08 08:40:03 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 08:40:03 2016 +0000 |
tree | 5ffd7a59cdbafe13129af4e68e8a8ae672e0bb37 | |
parent | c6ced086d11e2db9b4d29446c89b53d94fd678dd [diff] | |
parent | 447d3798f10e22609b1d30c30a5774902c95e121 [diff] |
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am: 014016cf32 am: 447d3798f1 Change-Id: I323c669ed44e10f9e3a91271f47800754da5d389