OSDN Git Service

Merge \\"Only define sa_family_t once.\\" am: 237366867a
authorElliott Hughes <enh@google.com>
Fri, 22 Jul 2016 00:41:43 +0000 (00:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Jul 2016 00:41:43 +0000 (00:41 +0000)
commitfd8843fc88e0c04b16bdd24cfdc772fbc6e1c213
tree39e71da597fa2f70c5e79fb3bd86258b6183a70f
parent34fcf7ca8b5e7aab75cf0876de76978561ceba22
parentf3a094a4ea54905d713c264b3386a9cd81e164c1
Merge \\"Only define sa_family_t once.\\" am: 237366867a
am: f3a094a4ea

Change-Id: Ifaf33d50facd007d14696d3f0efdc225e43a518e