commit 7d7367ab18f62a00adf72a7053872ada43e3949a
author Christopher Ferris <cferris@google.com> Sat Sep 06 17:54:36 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Sep 06 17:54:36 2014 +0000
tree 43f13069a965cd18c18d83c21c6379078c3418b3
parent 4e5528f8a2787934a2c091ce11c757a44d7ec445
parent e8960dc707b76d83fbf8a650314b93d8c28b1a38

am e8960dc7: Merge "Move check of IFF_LOWER_UP after all includes."

* commit 'e8960dc707b76d83fbf8a650314b93d8c28b1a38':
  Move check of IFF_LOWER_UP after all includes.

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