| commit | f04f3892fb1436d234cc8fc10ef6080ecd3a8fd3 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Sep 08 09:16:24 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 09:16:24 2016 +0000 |
| tree | 473f829f9c3a65d401d88cac45eadbcb7feb80a4 | |
| parent | 7f789902603335cfc42d4072aad004ebc3ecda95 [diff] | |
| parent | b126d7c7c57f92287ec8b47c977524d4e81399b8 [diff] |
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am: 014016cf32 am: 447d3798f1 am: 71e6a6f12a am: 177ee386b9 am: b126d7c7c5 Change-Id: Ibd4f7188bf500886e53d4b714e5c7de1ad5b10c0