| commit | 9186e7de4a09b0a4f4432fcc06ac1a755e94a700 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Wed May 10 06:21:33 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 10 06:21:33 2017 +0000 |
| tree | 04d7416329711869ba9b8168baa5c81664e34e92 | |
| parent | 3293d082ff5208a54963264cc34e3065279c11ca [diff] | |
| parent | 0be1e5b589c2fe59fc9a16ef5773c96c6b726b31 [diff] |
Merge "Allow passing in a mark to use for listen sockets." am: 698a2ff03c am: 0be1e5b589 Change-Id: I36bd3953e1669796f2673c1a506d7b767072c4f3