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)
commit51c4d51d8f8274a5040053493b8d598a0e77a175
tree18fec809bacd140250127746fd39b2125339b2af
parent10292607e4de21f6075beb71c91a2c6669670623
parenta4ab398c617055f5f5895f6b9f6ca5bf0f6e520f
am a4ab398c: am 7c460451: Merge "Fix SOCK_* flag definitions"

* commit 'a4ab398c617055f5f5895f6b9f6ca5bf0f6e520f':
  Fix SOCK_* flag definitions