| commit | 322453f269ac0b736f20e4619b900be155a65d2e | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Fri Jan 22 18:44:06 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 22 18:44:06 2016 +0000 |
| tree | 2a243c6967a89d2958396fc2e8a29e28e51492db | |
| parent | e053338c0f28100e2b5e5e5353fa52289c64a133 [diff] | |
| parent | abf2c81d1dba36cb71eed73d7a3a85bbefebb7ed [diff] |
Merge changes I035cd9b6,I8ca9f205 am: 40fded7e6a am: abf2c81d1d * commit 'abf2c81d1dba36cb71eed73d7a3a85bbefebb7ed': Make the SOCK_DESTROY tests work again. Make CloseSocketFromFd work on mapped sockets too.