summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCheryl Potter <cherylpotter@google.com>2015-08-21 23:01:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-21 23:01:17 +0000
commit251f24790757cf38bffbd6cec06c6503f99299dd (patch)
tree2c9f145d8a6d18e59557a031a806a4a7366899fe
parent852c6178629d3bdcd7d2c958379b0b71539f460f (diff)
parentdc35d48f4fdc2016f900207ebc934e5a57bd9265 (diff)
downloadframeworks_base-251f24790757cf38bffbd6cec06c6503f99299dd.zip
frameworks_base-251f24790757cf38bffbd6cec06c6503f99299dd.tar.gz
frameworks_base-251f24790757cf38bffbd6cec06c6503f99299dd.tar.bz2
am dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs
* commit 'dc35d48f4fdc2016f900207ebc934e5a57bd9265': docs: changed red to yellow in code snippet
-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>