diff options
author | Katie McCormick <kmccormick@google.com> | 2013-11-26 21:58:18 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-26 21:58:18 +0000 |
commit | 484b57a5655f28967e0062f578f38535dff52323 (patch) | |
tree | 94e94be4d270bf1cc070bdd78bbf6b9ca2aef76c /graphics/java/android | |
parent | fdb738a52fe0f0f3bef8b867c6646668d86835dd (diff) | |
parent | 9d0a88bd4e07deac01d7759b70cdf160456be1c0 (diff) | |
download | frameworks_base-484b57a5655f28967e0062f578f38535dff52323.zip frameworks_base-484b57a5655f28967e0062f578f38535dff52323.tar.gz frameworks_base-484b57a5655f28967e0062f578f38535dff52323.tar.bz2 |
am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs
* commit '9d0a88bd4e07deac01d7759b70cdf160456be1c0':
Doc updates: Javadoc fixes
Diffstat (limited to 'graphics/java/android')
-rw-r--r-- | graphics/java/android/graphics/ColorMatrix.java | 2 |
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, |