| commit | 01a805d2c2ae13279852fab6e21f6456f712b925 | [log] [tgz] |
|---|---|---|
| author | Yabin Cui <yabinc@google.com> | Wed Jan 14 22:18:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 14 22:18:38 2015 +0000 |
| tree | 59dc2aaf589fd6c608af35613a780fecf570d8c1 | |
| parent | 120b7fa3211858c5c860bc2f43103fdc66b276bb [diff] | |
| parent | 2cd0563c53c8aa566c924d389ff34d7c46ea43b7 [diff] |
am 2cd0563c: am d3119b19: Merge "Add ip6-localhost to /system/etc/hosts." * commit '2cd0563c53c8aa566c924d389ff34d7c46ea43b7': Add ip6-localhost to /system/etc/hosts.