commit 8213164116e5a379200ba10b478379da239d690f
author Narayan Kamath <narayan@google.com> Tue Oct 14 12:43:52 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 14 12:43:52 2014 +0000
tree a069ad14eddba316b5db06c82e96d32fa01b7e5a
parent af6e0b0c0cb946a4222d7f5bacc7bea11c33d814
parent 0037214648ffc810cd54c232b2026096e834a93a

am 00372146: Merge "Remove unused parameter"

* commit '0037214648ffc810cd54c232b2026096e834a93a':
  Remove unused parameter

Android.mk

diff --git a/Android.mk b/Android.mk
index e537384..f0b1fa7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -108,7 +108,6 @@
 LOCAL_C_INCLUDES += \
 	external/neven/FaceRecEm/common/src/b_FDSDK \
 	$(JNI_H_INCLUDE) \
-	$(call include-path-for, corecg graphics) \
 	$(LOCAL_PATH)/FaceRecEm/common/src \
 	$(LOCAL_PATH)/Embedded/common/conf \
 	$(LOCAL_PATH)/Embedded/common/src \

FaceDetector_jni.cpp

diff --git a/FaceDetector_jni.cpp b/FaceDetector_jni.cpp
index af9094d..7b44c75 100644
--- a/FaceDetector_jni.cpp
+++ b/FaceDetector_jni.cpp
@@ -24,7 +24,7 @@
 #include <utils/String8.h>
 #include <utils/Log.h>
 
-#include <core/SkBitmap.h>
+#include <SkBitmap.h>
 
 #include "jni.h"
 #include "JNIHelp.h"