diff options
| author | Elliott Hughes <enh@google.com> | 2014-09-08 13:08:43 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-09-08 13:08:43 -0700 |
| commit | 4656e69bf36d42a35c9290ab79eeb33b4cca1d5c (patch) | |
| tree | 84c6fe3c5e58781c54ce34961d9152d370919dae /graphics/java | |
| parent | 8268ad6779c38fb67ea3783fd57bf71bb0cccc51 (diff) | |
| parent | 2008cff73bbc816f867dac0cd057899bed714356 (diff) | |
| download | frameworks_base-4656e69bf36d42a35c9290ab79eeb33b4cca1d5c.zip frameworks_base-4656e69bf36d42a35c9290ab79eeb33b4cca1d5c.tar.gz frameworks_base-4656e69bf36d42a35c9290ab79eeb33b4cca1d5c.tar.bz2 | |
resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp
Change-Id: I5148eda624e8504f12dbc1288cd4a7a5b7c10850
Diffstat (limited to 'graphics/java')
| -rw-r--r-- | graphics/java/android/graphics/drawable/GradientDrawable.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java index 2c8611e..f3d06b1 100644 --- a/graphics/java/android/graphics/drawable/GradientDrawable.java +++ b/graphics/java/android/graphics/drawable/GradientDrawable.java @@ -489,9 +489,9 @@ public class GradientDrawable extends Drawable { /** * <p>Sets the colors used to draw the gradient. Each color is specified as an * ARGB integer and the array must contain at least 2 colors.</p> - * <p><strong>Note</strong>: changing orientation will affect all instances + * <p><strong>Note</strong>: changing colors will affect all instances * of a drawable loaded from a resource. It is recommended to invoke - * {@link #mutate()} before changing the orientation.</p> + * {@link #mutate()} before changing the colors.</p> * * @param colors 2 or more ARGB colors * |