Merge 143482 - Build fix after r143476

chrome/browser/resources/about_conflicts.html

Index: chrome/browser/resources/about_conflicts.html
===================================================================
--- chrome/browser/resources/about_conflicts.html	(revision 143844)
+++ chrome/browser/resources/about_conflicts.html	(working copy)
@@ -26,7 +26,7 @@
 }
 
 #header h1 {
-  background: url('../../app/theme/about_conflicts.png') 0px 20px no-repeat;
+  background: url('../../app/theme/default_100_percent/about_conflicts.png') 0px 20px no-repeat;
   display: inline;
   margin: 0;
   padding-bottom: 43px;
@@ -35,7 +35,7 @@
 }
 
 html[dir=rtl] #header h1 {
-  background: url('../../app/theme/about_conflicts.png') right no-repeat;
+  background: url('../../app/theme/default_100_percent/about_conflicts.png') right no-repeat;
   padding-right: 95px;
   padding-left: 0;
 }