From 6817861dcc9c88366b56fafe0500e27abfcaafda Mon Sep 17 00:00:00 2001
From: Jason parks <jparks@google.com>
Date: Tue, 24 May 2011 10:27:34 -0500
Subject: Re-enable nfc.

---
 Android.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index e5b93b5..b5ae045 100755
--- a/Android.mk
+++ b/Android.mk
@@ -12,8 +12,6 @@ LOCAL_JNI_SHARED_LIBRARIES := libnfc_jni
 
 LOCAL_PROGUARD_ENABLED := disabled
 
-# dont build in master
-# temporary
-#include $(BUILD_PACKAGE)
+include $(BUILD_PACKAGE)
 
-#include $(call all-makefiles-under,$(LOCAL_PATH))
+include $(call all-makefiles-under,$(LOCAL_PATH))
-- 
cgit v1.1