tree b34b1e928e5883c402d6a307497e3683ab916338
parent 97d59c2df3418b1ff6733bb3fd2dc69567cead3b
parent ee41b1df9bd7d5ead089f7beffbb21955d2f2858
author Elliott Hughes <enh@google.com> 1363969516 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363969516 -0700

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

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