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