am 3d7637e8: am dbf94ec6: reconcile main tree with open-source eclair

Merge commit '3d7637e8f95bd7d4fcaf44d7a1663bb7290772c6'

* commit '3d7637e8f95bd7d4fcaf44d7a1663bb7290772c6':
  android-2.1_r1 snapshot
diff --git a/FaceDetector_jni.cpp b/FaceDetector_jni.cpp
index a4ceeec..03bd908 100644
--- a/FaceDetector_jni.cpp
+++ b/FaceDetector_jni.cpp
@@ -243,6 +243,8 @@
     int numberOfFaces = 0;
     if (btk_FaceFinder_putDCR(hfd, hdcr) == btk_STATUS_OK) {
         numberOfFaces = btk_FaceFinder_faces(hfd);
+    } else {
+        LOGE("ERROR: Return 0 faces because error exists in btk_FaceFinder_putDCR.\n");
     }
 
     // release the arrays we're using