summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorCheryl Potter <cherylpotter@google.com>2015-08-21 23:08:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-21 23:08:00 +0000
commit41fc973c144287c010d6219ab82f2640ebaff9dc (patch)
tree0210e2d203c8d0aa7a9f3646c0e01731b3317d47 /docs/html
parente6c64508aba566b5bd4ac9cd87a07358b13f5a06 (diff)
parent251f24790757cf38bffbd6cec06c6503f99299dd (diff)
downloadframeworks_base-41fc973c144287c010d6219ab82f2640ebaff9dc.zip
frameworks_base-41fc973c144287c010d6219ab82f2640ebaff9dc.tar.gz
frameworks_base-41fc973c144287c010d6219ab82f2640ebaff9dc.tar.bz2
am 251f2479: am dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs
* commit '251f24790757cf38bffbd6cec06c6503f99299dd': docs: changed red to yellow in code snippet
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 63eee96..6f9545d 100644
--- a/docs/html/guide/topics/resources/providing-resources.jd
+++ b/docs/html/guide/topics/resources/providing-resources.jd
@@ -954,7 +954,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>