tree a9b41b67ff0d6aadc910d90382b87596ec028ae9
parent 62ea6b268faf14abce5afd53065863f84fc361d7
parent d3119b1962ef5c0d15b9cc22beb9ded040b44dcb
author Yabin Cui <yabinc@google.com> 1421192366 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421192366 +0000

am d3119b19: Merge "Add ip6-localhost to /system/etc/hosts."

* commit 'd3119b1962ef5c0d15b9cc22beb9ded040b44dcb':
  Add ip6-localhost to /system/etc/hosts.