diff options
author | Leon Scroggins III <scroggo@google.com> | 2014-03-07 18:30:43 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 18:30:43 +0000 |
commit | 6bf9ef8c06c3c4be9df094a2deaaa76c5da4606b (patch) | |
tree | 1194566c8d23d51c5093bd395a8f72011e11e24b /graphics/java | |
parent | 42ae4cf2ce5ba02c2211813452badc07eab33735 (diff) | |
parent | 87e9e744ed7acc554a6b4c7dd90fab376eabb30b (diff) | |
download | frameworks_base-6bf9ef8c06c3c4be9df094a2deaaa76c5da4606b.zip frameworks_base-6bf9ef8c06c3c4be9df094a2deaaa76c5da4606b.tar.gz frameworks_base-6bf9ef8c06c3c4be9df094a2deaaa76c5da4606b.tar.bz2 |
am 87e9e744: am 92a32832: DO NOT MERGE - Fix Javadoc build break.
* commit '87e9e744ed7acc554a6b4c7dd90fab376eabb30b':
DO NOT MERGE - Fix Javadoc build break.
Diffstat (limited to 'graphics/java')
-rw-r--r-- | graphics/java/android/graphics/Bitmap.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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 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> |