OSDN Git Service

Merge changes Ib1510f36,I8a2f50da,Ife74d135,Idfb19903
authorLorenzo Colitti <lorenzo@google.com>
Tue, 26 Jan 2016 07:01:17 +0000 (07:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Jan 2016 07:01:17 +0000 (07:01 +0000)
commitf86cf5eab5b2364769a1777df23ef8db1c1b82dc
treeb3ca50df93dd2f3f92e685815116b41956d41d70
parent347d5ed57a22018b021ed683b21b56be8b745a19
parent9427861d2746735378aa3dc628c917fac2acec83
Merge changes Ib1510f36,I8a2f50da,Ife74d135,Idfb19903
am: 9427861d27

* commit '9427861d2746735378aa3dc628c917fac2acec83':
  Refactor TCP test code into its own file.
  Move some sock_diag tests around.
  Teach more sock_diag code and tests about mapped sockets.
  Delete the hack that finds mapped sockets.