| commit | 177ee386b9736e6cda34b1d838aaf91ecdc8f5bd | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Sep 08 08:45:47 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 08 08:45:47 2016 +0000 |
| tree | 683ee4f2528ae822041d6dd6304ba1c00df3a978 | |
| parent | 4474da7b7c78934097681ac6eabe64c400eb5aba [diff] | |
| parent | 71e6a6f12acf18e0cd1623b9b977ba410b4d1270 [diff] |
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am: 014016cf32 am: 447d3798f1 am: 71e6a6f12a Change-Id: Ib162897a1428ab8c025a414eb0a3872327274f7a