Commit 8b394af7 authored Aug 22, 2015 by Cheryl Potter Committed by Android Git Automerger Aug 22, 2015

am 0be53aef: am c4b0028e: am a4f65ff5: am 41fc973c: am 251f2479: am dc35d48f:...

am 0be53aef: am c4b0028e: am a4f65ff5: am 41fc973c: am 251f2479: am dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs

* commit '0be53aef':
  docs: changed red to yellow in code snippet

parents 09dbd46a 0be53aef

docs/html/guide/topics/resources/providing-resources.jd

+1 −1

Original line number	Diff line number	Diff line
		@@ -954,7 +954,7 @@ same way. For example, a color:</p>
		<?xml version="1.0" encoding="utf-8"?>
		<resources>
		<color name="yellow">#f00</color>
		<color name="highlight">@color/red</color>
		<color name="highlight">@color/yellow</color>
		</resources>
		</pre>