diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-03-29 11:04:30 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-03-29 11:04:30 -0700 |
| commit | 5849606df71fb3d5ce88b966cff8382deccd56b6 (patch) | |
| tree | 3f1b8743614ef924bd3a5a8cd82972480e91365c /graphics | |
| parent | c89704a77f9c51ebd8c1cc6863e15ff402a56c86 (diff) | |
| parent | 5f3445dc609fb3dd64b023c1ba9c1ee3ba95b868 (diff) | |
| download | frameworks_base-5849606df71fb3d5ce88b966cff8382deccd56b6.zip frameworks_base-5849606df71fb3d5ce88b966cff8382deccd56b6.tar.gz frameworks_base-5849606df71fb3d5ce88b966cff8382deccd56b6.tar.bz2 | |
merge from open-source master
Change-Id: I6a7542e696e69bc8788f3b3b77fcec50512ba81c
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; |