OSDN Git Service

Merge \\\"Only define sa_family_t once.\\\" am: 237366867a am: f3a094a4ea
authorElliott Hughes <enh@google.com>
Fri, 22 Jul 2016 00:44:13 +0000 (00:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Jul 2016 00:44:13 +0000 (00:44 +0000)
commit6c2f1779b04d59906480b9b762b9c4ade0125684
tree0626b21285df9e5b352a9a4f4cdcef68c3552fa4
parentc461f691c10dcc4af4c01d41f4eb481fc970be8a
parentfd8843fc88e0c04b16bdd24cfdc772fbc6e1c213
Merge \\\"Only define sa_family_t once.\\\" am: 237366867a am: f3a094a4ea
am: fd8843fc88

Change-Id: I227fca769e2af22dc8aab09af6f0795d92fc6170