OSDN Git Service

Merge "recvfrom takes a non-const pointer." am: 96660b37a1 am: 2f4c6e3d0d
authorElliott Hughes <enh@google.com>
Fri, 12 Aug 2016 20:19:16 +0000 (20:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 20:19:16 +0000 (20:19 +0000)
commit59d4a4ddd0ea0f50a5d70a44543449623c8e07b8
tree04db66a6d297c474118ca5d5479cc201c86efdd2
parentd14f0980da7026d1eaace30ea9c9013d39d6499a
parentc41a11a0eea943e05faa90b2e8415d8c0bbd851d
Merge "recvfrom takes a non-const pointer." am: 96660b37a1 am: 2f4c6e3d0d
am: c41a11a0ee

Change-Id: I48c43a9675568c6b6edbf2a94f51a21770196f2c