tree 0a910a7192213266c782922bc8914db5c3aaf4b4
parent dc90f9ba66cf93d99c8357b8e76145bfaf07f84d
parent 8223a7f0c4dd1119d05199f48fe70d854cd8b558
author Elliott Hughes <enh@google.com> 1363969643 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363969643 -0700

am 8223a7f0: am ee41b1df: Merge "Fix libcore translation of AF_UNSPEC InetAddress instances."

* commit '8223a7f0c4dd1119d05199f48fe70d854cd8b558':
  Fix libcore translation of AF_UNSPEC InetAddress instances.