summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Torne (Richard Coles) <torne@google.com> 2014-03-17 18:02:10 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-17 18:02:10 +0000
commit966bfa8df40d3d27bacdb2d9f8eb05c3eebafd01 (patch)
tree3316e792cef833aa9d668e83d7310bee11e62b64
parentae327cd206bb648a8e88e8f49f678a3ba4627a4e (diff)
parent01252217a5d779c885645028a5df70215e7be4f4 (diff)
am 01252217: Merge "Fix javadoc." into klp-modular-dev
* commit '01252217a5d779c885645028a5df70215e7be4f4': Fix javadoc.
-rw-r--r--graphics/java/android/graphics/Bitmap.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java
index 968ed743b06c..e32e4be2b10c 100644
--- a/graphics/java/android/graphics/Bitmap.java
+++ b/graphics/java/android/graphics/Bitmap.java
@@ -1052,7 +1052,7 @@ public final class Bitmap implements Parcelable {
* <p>This method will not affect the behavior of a bitmap without an alpha
* channel, or if {@link #hasAlpha()} returns false.</p>
*
- * <p>Calling {@link createBitmap()} or {@link createScaledBitmap()} with a source
+ * <p>Calling {@link #createBitmap()} or {@link #createScaledBitmap()} with a source
* Bitmap whose colors are not pre-multiplied may result in a RuntimeException,
* since those functions require drawing the source, which is not supported for
* un-pre-multiplied Bitmaps.</p>