diff options
| author | Katie McCormick <kmccormick@google.com> | 2013-12-02 12:37:58 -0800 |
|---|---|---|
| committer | Katie McCormick <kmccormick@google.com> | 2013-12-02 12:37:58 -0800 |
| commit | d786a1900e94c4f0c919b50b44667cea32fd2939 (patch) | |
| tree | de79d8d23967927e2fcdc944189e0fe6a0b8ddc8 /graphics/java/android | |
| parent | 866dbc9a73eb18bc47fe2f45c40bbb753b26d27e (diff) | |
| parent | 37e4c405a6136f90e5a8d4fc512cf7f551eb0c56 (diff) | |
| download | frameworks_base-d786a1900e94c4f0c919b50b44667cea32fd2939.zip frameworks_base-d786a1900e94c4f0c919b50b44667cea32fd2939.tar.gz frameworks_base-d786a1900e94c4f0c919b50b44667cea32fd2939.tar.bz2 | |
resolved conflicts for merge of 37e4c405 to master
Change-Id: I7df89be84384369ef5e89bb3b924ca38c1b5d9bd
Diffstat (limited to 'graphics/java/android')
| -rw-r--r-- | graphics/java/android/graphics/ColorMatrix.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/ColorMatrix.java b/graphics/java/android/graphics/ColorMatrix.java index 0ef037d..1242eb5 100644 --- a/graphics/java/android/graphics/ColorMatrix.java +++ b/graphics/java/android/graphics/ColorMatrix.java @@ -21,8 +21,8 @@ import android.util.FloatMath; import java.util.Arrays; /** - * 5x4 matrix for transforming the color+alpha components of a Bitmap. - * The matrix is stored in a single array, and its treated as follows: + * 4x5 matrix for transforming the color+alpha components of a Bitmap. + * The matrix is stored in a single array, and its treated as follows: * <pre> * [ a, b, c, d, e, * f, g, h, i, j, |