am 03c185bf: am c61b0de8: Merge change Id6ccc9bc into eclair-mr2

Merge commit '03c185bf763fd2a289131d64e4b14d4a5461d80f'

* commit '03c185bf763fd2a289131d64e4b14d4a5461d80f':
  Update documentation: The width of the image for face detection must be even.
diff --git a/media/java/android/media/FaceDetector.java b/media/java/android/media/FaceDetector.java
index 3b41cf8..cf900ce 100644
--- a/media/java/android/media/FaceDetector.java
+++ b/media/java/android/media/FaceDetector.java
@@ -102,6 +102,7 @@
      * Creates a FaceDetector, configured with the size of the images to
      * be analysed and the maximum number of faces that can be detected.
      * These parameters cannot be changed once the object is constructed.
+     * Note that the width of the image must be even.
      * 
      * @param width  the width of the image
      * @param height the height of the image