OSDN Git Service

am a4ab398c: am 7c460451: Merge "Fix SOCK_* flag definitions"
authorGreg Hackmann <ghackmann@google.com>
Sat, 19 Sep 2015 19:59:51 +0000 (19:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 19 Sep 2015 19:59:51 +0000 (19:59 +0000)
* commit 'a4ab398c617055f5f5895f6b9f6ca5bf0f6e520f':
  Fix SOCK_* flag definitions


Trivial merge