From 967717af5423377c967781471ee106e2bb4e11c8 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 22 Jul 2010 15:37:06 +0100 Subject: Merge WebKit at r63859 : Initial merge by git. Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62 --- Android.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 5d7496b..ca23094 100644 --- a/Android.mk +++ b/Android.mk @@ -127,7 +127,10 @@ LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(LOCAL_PATH)/WebCore \ $(LOCAL_PATH)/WebCore/accessibility \ +<<<<<<< HEAD:Android.mk $(LOCAL_PATH)/WebCore/bindings/ \ +======= +>>>>>>> webkit.org at r63859:Android.mk $(LOCAL_PATH)/WebCore/bindings/generic \ $(LOCAL_PATH)/WebCore/css \ $(LOCAL_PATH)/WebCore/dom \ -- cgit v1.1