OSDN Git Service

Merge "Fix recvfrom prototype." am: 4a77fa3dcd am: a7908ef625
authorElliott Hughes <enh@google.com>
Fri, 12 Aug 2016 20:18:39 +0000 (20:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 20:18:39 +0000 (20:18 +0000)
am: 326498d787

Change-Id: Ia0b4d0e99a695d962d1d7c1a3081647f8529b6c5


Trivial merge