OSDN Git Service

Merge changes I1c396ab2,Ibf0223cc,Ibe49c873,I6aa1bb98,Ib091831c
authorLorenzo Colitti <lorenzo@google.com>
Thu, 14 Jan 2016 14:47:54 +0000 (14:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Jan 2016 14:47:54 +0000 (14:47 +0000)
commit45801c4bb2217e245671dd6d709a34fe4f7bb342
tree1e093463be8f24d5069be2f1a264e86e85bc6941
parent3c81380ecb2bc8c3f4a0e86cd5b454df794a1704
parent59c72161d70447232ee646d2cb9b756d76db91f3
Merge changes I1c396ab2,Ibf0223cc,Ibe49c873,I6aa1bb98,Ib091831c
am: 59c72161d7

* commit '59c72161d70447232ee646d2cb9b756d76db91f3':
  Make RTA_METRICS parsing work properly.
  Slightly simplify dumping sockets.
  Support specifying attributes in dump requests.
  Don't run the sock_diag tests twice.
  Test for a SOCK_DIAG oops on IPv4-mapped SYN_RECV connections.