diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-09-28 23:37:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 23:37:09 -0700 |
| commit | f1fd5eb8cca9f1096c4d0de5abbbd2b264fd1b9e (patch) | |
| tree | e74a8f591a3202188766d7453d99171cf42c0c15 /init | |
| parent | df2f5a07aecac7be4ac2d1100668a0396fd256e7 (diff) | |
| parent | 2f7b72f9e8d06c80957cdf384d23d3bf5bd5ce5c (diff) | |
| download | system_core-f1fd5eb8cca9f1096c4d0de5abbbd2b264fd1b9e.zip system_core-f1fd5eb8cca9f1096c4d0de5abbbd2b264fd1b9e.tar.gz system_core-f1fd5eb8cca9f1096c4d0de5abbbd2b264fd1b9e.tar.bz2 | |
am 2f7b72f9: netstat should include /proc/net/tcp6 and /proc/net/udp6 data
Merge commit '2f7b72f9e8d06c80957cdf384d23d3bf5bd5ce5c' into gingerbread-plus-aosp
* commit '2f7b72f9e8d06c80957cdf384d23d3bf5bd5ce5c':
netstat should include /proc/net/tcp6 and /proc/net/udp6 data
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions