summaryrefslogtreecommitdiffstats
path: root/graphics/java/android
diff options
context:
space:
mode:
authorKatie McCormick <kmccormick@google.com>2013-11-26 21:56:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-11-26 21:56:09 +0000
commit9d0a88bd4e07deac01d7759b70cdf160456be1c0 (patch)
treee07108a9ecd6cf99ef33393278da82b31399a930 /graphics/java/android
parent752d8029176d3670b9e817d8465d854d4a1b933e (diff)
parentf2ef28d840647d2f16792313bdc22b2114a5df6a (diff)
downloadframeworks_base-9d0a88bd4e07deac01d7759b70cdf160456be1c0.zip
frameworks_base-9d0a88bd4e07deac01d7759b70cdf160456be1c0.tar.gz
frameworks_base-9d0a88bd4e07deac01d7759b70cdf160456be1c0.tar.bz2
Merge "Doc updates: Javadoc fixes" into klp-docs
Diffstat (limited to 'graphics/java/android')
-rw-r--r--graphics/java/android/graphics/ColorMatrix.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/ColorMatrix.java b/graphics/java/android/graphics/ColorMatrix.java
index c22cda1..e3596c8 100644
--- a/graphics/java/android/graphics/ColorMatrix.java
+++ b/graphics/java/android/graphics/ColorMatrix.java
@@ -19,7 +19,7 @@ package android.graphics;
import android.util.FloatMath;
/**
- * 5x4 matrix for transforming the color+alpha components of a Bitmap.
+ * 4x5 matrix for transforming the color+alpha components of a Bitmap.
* The matrix is stored in a single array, and its treated as follows:
* [ a, b, c, d, e,
* f, g, h, i, j,