diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-03-29 11:21:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-29 11:21:39 -0700 |
| commit | 758e8d1d1daaa20fe65e9ff31153e657343aa011 (patch) | |
| tree | 61bbc602e733f3b9fbe24648ade0f1ca7269f289 /graphics | |
| parent | d646f69c4e7cf0ad06bd2687a31b5cbb4441230c (diff) | |
| parent | 2438894df093f91125f4a217ea98e759fa5c8616 (diff) | |
| download | frameworks_base-758e8d1d1daaa20fe65e9ff31153e657343aa011.zip frameworks_base-758e8d1d1daaa20fe65e9ff31153e657343aa011.tar.gz frameworks_base-758e8d1d1daaa20fe65e9ff31153e657343aa011.tar.bz2 | |
am 2438894d: am 5849606d: merge from open-source master
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/Color.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/Color.java b/graphics/java/android/graphics/Color.java index 5cefaa3..a50693d 100644 --- a/graphics/java/android/graphics/Color.java +++ b/graphics/java/android/graphics/Color.java @@ -30,7 +30,8 @@ import java.util.Locale; * (green << 8) | blue. Each component ranges between 0..255 with 0 * meaning no contribution for that component, and 255 meaning 100% * contribution. Thus opaque-black would be 0xFF000000 (100% opaque but - * no contributes from red, gree, blue, and opaque-white would be 0xFFFFFFFF + * no contributions from red, green, or blue), and opaque-white would be + * 0xFFFFFFFF */ public class Color { public static final int BLACK = 0xFF000000; |