commit 2b282d312dfc359258934cb60e2c6bc833bb19a7
author Brad Fitzpatrick <bradfitz@android.com> Sun Oct 03 21:19:12 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sun Oct 03 21:19:12 2010 -0700
tree 71e8ad9a4e5445873431142415dd2dbd75c65933
parent a07139d92321c999e560c0b4d019a538c99a2532
parent 3d019a374fa41a11fb7b718770076e61235d1c45

am 3d019a37: am 83d52229: Doc fix: duplicate word \'of\'

Merge commit '3d019a374fa41a11fb7b718770076e61235d1c45'

* commit '3d019a374fa41a11fb7b718770076e61235d1c45':
  Doc fix: duplicate word 'of'

graphics/java/android/graphics/Canvas.java

diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java
index e75a19e..952f2b5 100644
--- a/graphics/java/android/graphics/Canvas.java
+++ b/graphics/java/android/graphics/Canvas.java
@@ -1079,7 +1079,7 @@
      *
      * @param colors Array of colors representing the pixels of the bitmap
      * @param offset Offset into the array of colors for the first pixel
-     * @param stride The number of of colors in the array between rows (must be
+     * @param stride The number of colors in the array between rows (must be
      *               >= width or <= -width).
      * @param x The X coordinate for where to draw the bitmap
      * @param y The Y coordinate for where to draw the bitmap