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

commit: 614594973f39cbc3768315d4b2b43f21eb714f72 [log] [tgz]
author: Cheryl Potter <cherylpotter@google.com> Wed Aug 26 20:58:40 2015 +0000
committer: Android Git Automerger <android-git-automerger@android.com> Wed Aug 26 20:58:40 2015 +0000
tree: a621590d594a4d322bdbae4dc1c6dde285eb9c36
parent: 443ae69b16157aa05ec82bed7b2b8a9fa6cad7f4 [diff]
parent: dc35d48f4fdc2016f900207ebc934e5a57bd9265 [diff]
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 @@
 &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>
commit	614594973f39cbc3768315d4b2b43f21eb714f72	[log] [tgz]
author	Cheryl Potter <cherylpotter@google.com>	Wed Aug 26 20:58:40 2015 +0000
committer	Android Git Automerger <android-git-automerger@android.com>	Wed Aug 26 20:58:40 2015 +0000
tree	a621590d594a4d322bdbae4dc1c6dde285eb9c36
parent	443ae69b16157aa05ec82bed7b2b8a9fa6cad7f4 [diff]
parent	dc35d48f4fdc2016f900207ebc934e5a57bd9265 [diff]