OSDN Git Service

am 90ae787b: am 666d06fe: Merge "Backwards and forwards compatibility for an upcoming...
authorElliott Hughes <enh@google.com>
Wed, 12 Sep 2012 18:07:12 +0000 (11:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Sep 2012 18:07:12 +0000 (11:07 -0700)
* commit '90ae787b30890dc7d0f5d95b67ea5578d53bd61e':
  Backwards and forwards compatibility for an upcoming <sys/socket.h> change.


Trivial merge