summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorYabin Cui <yabinc@google.com>2015-01-13 23:39:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-13 23:39:26 +0000
commit2cd0563c53c8aa566c924d389ff34d7c46ea43b7 (patch)
treea9b41b67ff0d6aadc910d90382b87596ec028ae9 /rootdir
parent62ea6b268faf14abce5afd53065863f84fc361d7 (diff)
parentd3119b1962ef5c0d15b9cc22beb9ded040b44dcb (diff)
downloadsystem_core-2cd0563c53c8aa566c924d389ff34d7c46ea43b7.zip
system_core-2cd0563c53c8aa566c924d389ff34d7c46ea43b7.tar.gz
system_core-2cd0563c53c8aa566c924d389ff34d7c46ea43b7.tar.bz2
am d3119b19: Merge "Add ip6-localhost to /system/etc/hosts."
* commit 'd3119b1962ef5c0d15b9cc22beb9ded040b44dcb': Add ip6-localhost to /system/etc/hosts.
Diffstat (limited to 'rootdir')
-rw-r--r--rootdir/etc/hosts3
1 files changed, 2 insertions, 1 deletions
diff --git a/rootdir/etc/hosts b/rootdir/etc/hosts
index 99848f6..649151c 100644
--- a/rootdir/etc/hosts
+++ b/rootdir/etc/hosts
@@ -1 +1,2 @@
-127.0.0.1 localhost
+127.0.0.1 localhost
+::1 ip6-localhost