Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11e09bd6 authored by Doug Zongker's avatar Doug Zongker Committed by Android (Google) Code Review
Browse files

Merge "resolved conflicts for merge of a1ca303a to master"

parents 97d9b654 f168e4c4
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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 createBitmap() or 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>