am 2b3489dd: am 5e5001bc: Merge change I7ed72bf5 into eclair

Merge commit '2b3489ddad289387a68955fbfaa37461b4d8a911'

* commit '2b3489ddad289387a68955fbfaa37461b4d8a911':
  Add documentation for scene mode. Other parameters may be changed after setting scene mode.

core/java/android/hardware/Camera.java

@@ -1281,7 +1281,11 @@ public class Camera {
         }
 
         /**
-         * Sets the scene mode.
+         * Sets the scene mode. Other parameters may be changed after changing
+         * scene mode. For example, flash and supported flash mode may be
+         * changed to "off" in night scene mode. After setting scene mode,
+         * applications should call getParameters to know if some parameters are
+         * changed.
          *
          * @param value SCENE_MODE_XXX string constants.
          */