commit 6cda8a6cd78c35c806a8bd362a79facd59ff55c4
author The Android Automerger <android-build@google.com> Mon Apr 11 16:00:20 2016 -0700
committer The Android Automerger <android-build@google.com> Mon Apr 11 16:00:20 2016 -0700
tree c8bb7886653623da9e8598d06be344ccd9f0fedd
parent ce477f9fac60afeb6224a6c418a7e6032fefea85
parent 52aec3c64d771aab8d2396f2a36fe372ed833710

merge in nyc-release history after reset to nyc-dev

iptables/Android.mk

diff --git a/iptables/Android.mk b/iptables/Android.mk
index efe6526..d0fd7d3 100644
--- a/iptables/Android.mk
+++ b/iptables/Android.mk
@@ -34,6 +34,8 @@
     ln -sf iptables $(TARGET_OUT)/bin/iptables-save; \
     ln -sf iptables $(TARGET_OUT)/bin/iptables-restore
 
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
+
 include $(BUILD_EXECUTABLE)
 
 #----------------------------------------------------------------
@@ -69,6 +71,8 @@
     ln -sf ip6tables $(TARGET_OUT)/bin/ip6tables-save; \
     ln -sf ip6tables $(TARGET_OUT)/bin/ip6tables-restore
 
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
+
 include $(BUILD_EXECUTABLE)