OSDN Git Service

resolved conflicts for merge of 62727429 to master
authorElliott Hughes <enh@google.com>
Wed, 13 Feb 2013 21:51:54 +0000 (13:51 -0800)
committerElliott Hughes <enh@google.com>
Wed, 13 Feb 2013 21:51:54 +0000 (13:51 -0800)
commit8ca1da6e715fe2bc148a0b569e326a7713518f1d
treea0556666444acb3808ff12486434dcdbab323137
parent6aca0ce367c96d1e1a1df83c04576460251fd3e7
parent627274292edf1d051dd939a0b14b69d3fcb84742
resolved conflicts for merge of 62727429 to master

Change-Id: I8a3d167f3ef279a7c46cb8fb90c9477beff84d8e
libc/netbsd/net/getnameinfo.c