commit 8352d7a311ae3f7838cc9d9ee0d69625f73b89e6
author Dan Rodney <danrodney@google.com> Tue Jan 20 17:03:46 2015 -0600
committer Dan Rodney <danrodney@google.com> Tue Jan 20 17:03:46 2015 -0600
tree 043680fc9f6d686dfeb8ac5a0129b6fdc61fb3e8
parent 27209ff8d25be29db541a9772a0da818b4b834b8
parent af2bd0869f68c9ab48c2a5bb7ffd2fda78789666

resolved conflicts for merge of af2bd086 to lmp-mr1-dev-plus-aosp

Change-Id: Ic8655447bac2d8a780fd21293cc3ccaa320d4eb8

Android.mk

diff --git a/Android.mk b/Android.mk
index 6a1988b..381bcc1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -92,7 +92,7 @@
 include $(BUILD_EXECUTABLE)
 
 ############################
-# This builds an mDns that is embeddable within GmsCore for the local apps connection API
+# This builds an mDns that is embeddable within GmsCore for the nearby connections API
 
 ### STATIC LIB ###
 include $(CLEAR_VARS)
@@ -119,7 +119,7 @@
 LOCAL_CFLAGS += -Os -fvisibility=hidden
 LOCAL_CFLAGS += $(commonFlags) \
                 -UMDNS_DEBUGMSGS \
-                -DMDNS_DEBUGMSGS=1 \
+                -DMDNS_DEBUGMSGS=0 \
                 -DSO_REUSEADDR \
                 -DUNICAST_DISABLED