diff --git a/platform_tools/android/gyp_gen/makefile_writer.py b/platform_tools/android/gyp_gen/makefile_writer.py
index 9b63b656b6..a199a831f4 100644
--- a/platform_tools/android/gyp_gen/makefile_writer.py
+++ b/platform_tools/android/gyp_gen/makefile_writer.py
@@ -76,6 +76,8 @@ AUTOGEN_WARNING = (
 #
 # THIS FILE IS AUTOGENERATED BY GYP_TO_ANDROID.PY. DO NOT EDIT.
 #
+# For bugs, please contact scroggo@google.com or djsollen@google.com
+#
 ###############################################################################
 
 """
diff --git a/platform_tools/android/tests/expectations/Android.mk b/platform_tools/android/tests/expectations/Android.mk
index daf4a3c4c9..371979e8b4 100644
--- a/platform_tools/android/tests/expectations/Android.mk
+++ b/platform_tools/android/tests/expectations/Android.mk
@@ -3,6 +3,8 @@
 #
 # THIS FILE IS AUTOGENERATED BY GYP_TO_ANDROID.PY. DO NOT EDIT.
 #
+# For bugs, please contact scroggo@google.com or djsollen@google.com
+#
 ###############################################################################
 
 BASE_PATH := $(call my-dir)
diff --git a/platform_tools/android/tests/expectations/tool/Android.mk b/platform_tools/android/tests/expectations/tool/Android.mk
index 10a5fb2207..7cb3e83ec0 100644
--- a/platform_tools/android/tests/expectations/tool/Android.mk
+++ b/platform_tools/android/tests/expectations/tool/Android.mk
@@ -3,6 +3,8 @@
 #
 # THIS FILE IS AUTOGENERATED BY GYP_TO_ANDROID.PY. DO NOT EDIT.
 #
+# For bugs, please contact scroggo@google.com or djsollen@google.com
+#
 ###############################################################################
 
 LOCAL_PATH:= $(call my-dir)