commit 615c0385e7ef3aae9ea8b9ba4d00e3fb3c94512f
author Elliott Hughes <enh@google.com> Wed Jun 25 00:28:59 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 25 00:28:59 2014 +0000
tree a7225d67d840f49667261049245eac84bd6bc158
parent 318e97ad91efb3d4aa53cfd1d2405e2b20df2ad5
parent a02b96d06acdeb377ffa05525b3b912938fe685c

am a02b96d0: Merge "Move dhcpcd off its own getline."

* commit 'a02b96d06acdeb377ffa05525b3b912938fe685c':
  Move dhcpcd off its own getline.

android.conf

diff --git a/android.conf b/android.conf
index bde048c..5f5fd54 100755
--- a/android.conf
+++ b/android.conf
@@ -1,6 +1,9 @@
 # dhcpcd configuration for Android Wi-Fi interface
 # See dhcpcd.conf(5) for details.
 
+# IPv6 RS/RA processing is handled by the kernel. See also http://b/15268738
+noipv6rs
+
 interface wlan0
 # dhcpcd-run-hooks uses these options.
 option subnet_mask, routers, domain_name_servers, domain_name, domain_search