summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorCheryl Potter <cherylpotter@google.com>2015-08-21 22:51:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-21 22:51:30 +0000
commitdc35d48f4fdc2016f900207ebc934e5a57bd9265 (patch)
tree4d2af2a2a53e8d615c3977fed101fb42b7b0ba5c /docs/html
parent5389f46ce4245a6a0cfc931160ea13dab17f6590 (diff)
parent09e9ba3861b3ca92eeaa7e2f50f93b439a326bd6 (diff)
downloadframeworks_base-dc35d48f4fdc2016f900207ebc934e5a57bd9265.zip
frameworks_base-dc35d48f4fdc2016f900207ebc934e5a57bd9265.tar.gz
frameworks_base-dc35d48f4fdc2016f900207ebc934e5a57bd9265.tar.bz2
Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/guide/topics/resources/providing-resources.jd2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/guide/topics/resources/providing-resources.jd b/docs/html/guide/topics/resources/providing-resources.jd
index b06da56..be3f0b0 100644
--- a/docs/html/guide/topics/resources/providing-resources.jd
+++ b/docs/html/guide/topics/resources/providing-resources.jd
@@ -938,7 +938,7 @@ same way. For example, a color:</p>
&lt;?xml version="1.0" encoding="utf-8"?>
&lt;resources>
&lt;color name="yellow">#f00&lt;/color>
- &lt;color name="highlight">@color/red&lt;/color>
+ &lt;color name="highlight">@color/yellow&lt;/color>
&lt;/resources>
</pre>