OSDN Git Service

Merge "Fix recvfrom prototype." am: 4a77fa3dcd
authorElliott Hughes <enh@google.com>
Fri, 12 Aug 2016 20:09:59 +0000 (20:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 20:09:59 +0000 (20:09 +0000)
commit326498d787a4787fd50b547581866720054e2e25
tree5dfc052167e273d5465b0d5d217e32eb7823203c
parenta37d8c88c157b03cf4080307308d4868122263d1
parenta7908ef62587020dca3803859beab332effae45e
Merge "Fix recvfrom prototype." am: 4a77fa3dcd
am: a7908ef625

Change-Id: If114779201ab100fd0b3dd88aed51082880d6ddd