Merge "docs: Fix typo in Time#compare" into mnc-docs
diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java
index 6026d04..2ac72ad 100644
--- a/core/java/android/view/MotionEvent.java
+++ b/core/java/android/view/MotionEvent.java
@@ -2002,7 +2002,7 @@
/**
* Return the pointer identifier associated with a particular pointer
- * data index is this event. The identifier tells you the actual pointer
+ * data index in this event. The identifier tells you the actual pointer
* number associated with the data, accounting for individual pointers
* going up and down since the start of the current gesture.
* @param pointerIndex Raw index of pointer to retrieve. Value may be from 0
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 43c578f..d67a0b4 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -159,7 +159,7 @@
* that set them will vary among the different subclasses of views. Note that
* properties that are known at build time can be set in the XML layout
* files.</li>
- * <li><strong>Set focus:</strong> The framework will handled moving focus in
+ * <li><strong>Set focus:</strong> The framework will handle moving focus in
* response to user input. To force focus to a specific view, call
* {@link #requestFocus}.</li>
* <li><strong>Set up listeners:</strong> Views allow clients to set listeners
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 67abe8d..7b29f3d 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -3354,7 +3354,7 @@
property is set to true by default but should be set to false if your adapter
will display items of varying heights. When this property is set to true and
your adapter displays items of varying heights, the scrollbar thumb will
- change size as the user scrolls through the list. When set to fale, the list
+ change size as the user scrolls through the list. When set to false, the list
will use only the number of items in the adapter and the number of items visible
on screen to determine the scrollbar's properties. -->
<attr name="smoothScrollbar" format="boolean" />
diff --git a/docs/html/tools/debugging/debugging-memory.jd b/docs/html/tools/debugging/debugging-memory.jd
index 71c009d..4e2e519 100755
--- a/docs/html/tools/debugging/debugging-memory.jd
+++ b/docs/html/tools/debugging/debugging-memory.jd
@@ -350,9 +350,9 @@
<p class="note"><strong>Note:</strong> You will always see some allocations from {@code
-DdmVmInternal} and else where that come from the allocation tracker itself.</p>
+DdmVmInternal} and elsewhere that come from the allocation tracker itself.</p>
-<p>Although it's not necessary (nor possible) to remove all allocations for your performance
+<p>Although it's not necessary (nor possible) to remove all allocations from your performance
critical code paths, the allocation tracker can help you identify important issues in your code.
For instance, some apps might create a new {@link android.graphics.Paint} object on every draw.
Moving that object into a global member is a simple fix that helps improve performance.</p>