From b48d176a454377e02c6ae0e014746c0b28d6577c Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Tue, 10 Jun 2014 16:26:37 -0700 Subject: [PATCH] Fix garbage left in makefile Change-Id: Iaf1482b3a8d83ee2f45723229e57195a13652824 --- main/Android.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/main/Android.mk b/main/Android.mk index 0022dbb5e..5af1d2384 100644 --- a/main/Android.mk +++ b/main/Android.mk @@ -20,7 +20,6 @@ LOCAL_SRC_FILES += \ # BTIF LOCAL_SRC_FILES += \ -<<<<<<< HEAD ../btif/src/btif_av.c \ ../btif/src/btif_config.c \ ../btif/src/btif_config_util.cpp \ -- 2.11.0