OSDN Git Service

(root) / android-x86 / bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4fa5d6a ff20b91)
am ff20b911: am 8a363692: Merge "Add TCP_INFO state enum values."
authorElliott Hughes <enh@google.com>
Fri, 12 Jul 2013 01:57:42 +0000 (18:57 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 12 Jul 2013 01:57:42 +0000 (18:57 -0700)
* commit 'ff20b9110659e67433ce641a6224cdc9ccc01301':
  Add TCP_INFO state enum values.


Trivial merge
bionic
About OSDN
Find Software
Develop Software
Help