OSDN Git Service

am d12ea31b: am 85747809: Merge "Test that ip6-localhost exists in etc/hosts."
authorYabin Cui <yabinc@google.com>
Wed, 14 Jan 2015 12:07:32 +0000 (12:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 Jan 2015 12:07:32 +0000 (12:07 +0000)
* commit 'd12ea31b8dd050c5567425c121de3356b8e07e93':
  Test that ip6-localhost exists in etc/hosts.


Trivial merge