Merge "Replace icon for merge commit" into stable-2.9

gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java

@@ -70,6 +70,6 @@ public interface GerritResources extends ClientBundle {
   @Source("warning.png")
   public ImageResource warning();
 
-  @Source("important.png")
-  public ImageResource important();
+  @Source("merge.png")
+  public ImageResource merge();
 }

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.ui.xml

@@ -128,7 +128,7 @@ limitations under the License.
           </div>
           <g:Image
               ui:field='mergeCommit'
-              resource='{ico.important}'
+              resource='{ico.merge}'
               visible='false'
               title='Merge Commit'>
             <ui:attribute name='title'/>