| commit | e9295560cfb29b17f58bb16834f5d3bad45254ae | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Sep 09 10:39:29 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 09 10:39:29 2016 +0000 |
| tree | 683ee4f2528ae822041d6dd6304ba1c00df3a978 | |
| parent | eb972e5d9d7b303a1ca7b50f4b643f9d06cdd7b7 [diff] | |
| parent | bd6a29cddcd286020a00f1533a132fa3a119ffbc [diff] |
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am: 00e808b06b am: e59073096e am: 24ffc9ab47 am: bd6a29cddc Change-Id: I78f74e5d3f0e0b82afe4d5f48f2541a881189aa1