| commit | a6d7c72a086c994ad271b25f239765fef46a8e60 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Jan 14 14:49:51 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jan 14 14:49:51 2016 +0000 |
| tree | 451693baa00c1422ac0324fa43deb6e4d37dd6a3 | |
| parent | 88b25a486567a52e0988696045fe1aa955ed976b [diff] | |
| parent | 45801c4bb2217e245671dd6d709a34fe4f7bb342 [diff] |
Merge changes I1c396ab2,Ibf0223cc,Ibe49c873,I6aa1bb98,Ib091831c am: 59c72161d7 am: 45801c4bb2 * commit '45801c4bb2217e245671dd6d709a34fe4f7bb342': 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.