summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorKatie McCormick <kmccormick@google.com>2013-11-26 14:00:33 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-26 14:00:33 -0800
commit37e4c405a6136f90e5a8d4fc512cf7f551eb0c56 (patch)
treec3a6fea207090d615f7c103a970f7839326e84b8 /graphics
parent1ccc6633bf47c95601cc13a2566c702bb8d986cd (diff)
parent484b57a5655f28967e0062f578f38535dff52323 (diff)
downloadframeworks_base-37e4c405a6136f90e5a8d4fc512cf7f551eb0c56.zip
frameworks_base-37e4c405a6136f90e5a8d4fc512cf7f551eb0c56.tar.gz
frameworks_base-37e4c405a6136f90e5a8d4fc512cf7f551eb0c56.tar.bz2
am 484b57a5: am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs
* commit '484b57a5655f28967e0062f578f38535dff52323': Doc updates: Javadoc fixes
Diffstat (limited to 'graphics')
-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,