Merge "Improve camera javadoc."
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index 9011f73..6d955e7 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -1568,7 +1568,9 @@
         }
 
         /**
-         * Sets the dimensions for preview pictures.
+         * Sets the dimensions for preview pictures. If the preview has already
+         * started, applications should stop the preview first before changing
+         * preview size.
          *
          * The sides of width and height are based on camera orientation. That
          * is, the preview size is the size before it is rotated by display