diff options
| author | Jason Sams <jsams@google.com> | 2012-09-07 22:25:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-08 13:05:37 -0700 |
| commit | 4319079375ef49668ea88e74fb899275d6bbdb19 (patch) | |
| tree | ff967d1c3ce858473a514ee645127aad6665c6ad /graphics | |
| parent | 4aacf93d40b4be82aa35bf164d6fd6536c8b2a50 (diff) | |
| parent | 17fec32bba9da8df2062b52e414435574652ad50 (diff) | |
| download | frameworks_base-4319079375ef49668ea88e74fb899275d6bbdb19.zip frameworks_base-4319079375ef49668ea88e74fb899275d6bbdb19.tar.gz frameworks_base-4319079375ef49668ea88e74fb899275d6bbdb19.tar.bz2 | |
Merge "Fix doc typo." into jb-mr1-dev
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/renderscript/ScriptIntrinsicColorMatrix.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/renderscript/ScriptIntrinsicColorMatrix.java b/graphics/java/android/renderscript/ScriptIntrinsicColorMatrix.java index dce1939..8cac28e 100644 --- a/graphics/java/android/renderscript/ScriptIntrinsicColorMatrix.java +++ b/graphics/java/android/renderscript/ScriptIntrinsicColorMatrix.java @@ -80,7 +80,7 @@ public class ScriptIntrinsicColorMatrix extends ScriptIntrinsic { } /** - * Set a color matrix to convert from RGB to luminace. The alpha channel + * Set a color matrix to convert from RGB to luminance. The alpha channel * will be a copy. * */ |