commit | 90ae787b30890dc7d0f5d95b67ea5578d53bd61e | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Wed Sep 12 11:03:24 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 12 11:03:24 2012 -0700 |
tree | 79dd4140a44a2ff914657c70d113017fa10ebfff | |
parent | 7f798147980798718ac893229ae20dba9e3a26c7 [diff] | |
parent | 666d06fee9e1d2e1401a4b42d94d01e8f38ad1a5 [diff] |
am 666d06fe: Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change." * commit '666d06fee9e1d2e1401a4b42d94d01e8f38ad1a5': Backwards and forwards compatibility for an upcoming <sys/socket.h> change.