OSDN Git Service

Merge changes I035cd9b6,I8ca9f205 am: 40fded7e6a
authorLorenzo Colitti <lorenzo@google.com>
Fri, 22 Jan 2016 18:44:06 +0000 (18:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Jan 2016 18:44:06 +0000 (18:44 +0000)
commit322453f269ac0b736f20e4619b900be155a65d2e
tree2a243c6967a89d2958396fc2e8a29e28e51492db
parente053338c0f28100e2b5e5e5353fa52289c64a133
parentabf2c81d1dba36cb71eed73d7a3a85bbefebb7ed
Merge changes I035cd9b6,I8ca9f205 am: 40fded7e6a
am: abf2c81d1d

* commit 'abf2c81d1dba36cb71eed73d7a3a85bbefebb7ed':
  Make the SOCK_DESTROY tests work again.
  Make CloseSocketFromFd work on mapped sockets too.