summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-10-03 21:13:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-03 21:13:51 -0700
commit3d019a374fa41a11fb7b718770076e61235d1c45 (patch)
tree243f979e9b553bbc09edb2ca538e96465b8154b3 /graphics
parent7e53f3d70994cfef255953e1df1881d057477d06 (diff)
parent83d522290e56f614d0d9373d47c2b54b9e207795 (diff)
downloadframeworks_base-3d019a374fa41a11fb7b718770076e61235d1c45.zip
frameworks_base-3d019a374fa41a11fb7b718770076e61235d1c45.tar.gz
frameworks_base-3d019a374fa41a11fb7b718770076e61235d1c45.tar.bz2
am 83d52229: Doc fix: duplicate word \'of\'
Merge commit '83d522290e56f614d0d9373d47c2b54b9e207795' into gingerbread-plus-aosp * commit '83d522290e56f614d0d9373d47c2b54b9e207795': Doc fix: duplicate word 'of'
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/Canvas.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java
index 76cde73..a587d0d 100644
--- a/graphics/java/android/graphics/Canvas.java
+++ b/graphics/java/android/graphics/Canvas.java
@@ -1055,7 +1055,7 @@ public class Canvas {
*
* @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