commit 6bf9ef8c06c3c4be9df094a2deaaa76c5da4606b
author Leon Scroggins III <scroggo@google.com> Fri Mar 07 18:30:43 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 07 18:30:43 2014 +0000
tree 1194566c8d23d51c5093bd395a8f72011e11e24b
parent 42ae4cf2ce5ba02c2211813452badc07eab33735
parent 87e9e744ed7acc554a6b4c7dd90fab376eabb30b

am 87e9e744: am 92a32832: DO NOT MERGE - Fix Javadoc build break.

* commit '87e9e744ed7acc554a6b4c7dd90fab376eabb30b':
  DO NOT MERGE - Fix Javadoc build break.

graphics/java/android/graphics/Bitmap.java

diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java
index 2173f0c..b0be594 100644
--- a/graphics/java/android/graphics/Bitmap.java
+++ b/graphics/java/android/graphics/Bitmap.java
@@ -1052,7 +1052,7 @@
      * <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 createBitmap() or 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>