merge in jb-mr1-release history after reset to jb-mr1-dev
diff --git a/uiautomator/library/src/com/android/uiautomator/core/UiDevice.java b/uiautomator/library/src/com/android/uiautomator/core/UiDevice.java
index 8afc1a3..7534b83 100644
--- a/uiautomator/library/src/com/android/uiautomator/core/UiDevice.java
+++ b/uiautomator/library/src/com/android/uiautomator/core/UiDevice.java
@@ -694,6 +694,7 @@
* Take a screenshot of current window and store it as PNG
*
* Default scale of 1.0f (original size) and 90% quality is used
+ * The screenshot is adjusted per screen rotation
*
* @param storePath where the PNG should be written to
* @return
@@ -705,7 +706,7 @@
/**
* Take a screenshot of current window and store it as PNG
*
- * The screenshot is adjusted per screen rotation;
+ * The screenshot is adjusted per screen rotation
*
* @param storePath where the PNG should be written to
* @param scale scale the screenshot down if needed; 1.0f for original size
