| commit | 45801c4bb2217e245671dd6d709a34fe4f7bb342 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Jan 14 14:47:54 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jan 14 14:47:54 2016 +0000 |
| tree | 1e093463be8f24d5069be2f1a264e86e85bc6941 | |
| parent | 3c81380ecb2bc8c3f4a0e86cd5b454df794a1704 [diff] | |
| parent | 59c72161d70447232ee646d2cb9b756d76db91f3 [diff] |
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.