| commit | 6b07c525bd14c3980b4bfa57fb2653c578d92f2d | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Wed May 10 06:26:03 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 10 06:26:03 2017 +0000 |
| tree | 04d7416329711869ba9b8168baa5c81664e34e92 | |
| parent | 82519d70ba066ba43452f7562155d17287b6c4c9 [diff] | |
| parent | 9186e7de4a09b0a4f4432fcc06ac1a755e94a700 [diff] |
Merge "Allow passing in a mark to use for listen sockets." am: 698a2ff03c am: 0be1e5b589 am: 9186e7de4a Change-Id: Ia4e4bd61c668a6aa1aea74bd1c665d6042b799e5