Merge "Revert "Merge emails state the author if it differs from the submitter""

resources/com/google/gerrit/server/mail/Merged.soy

@@ -1,3 +1,4 @@
+
 /**
  * Copyright (C) 2016 The Android Open Source Project
  *
@@ -21,16 +22,10 @@
  * a change successfully merged to the head.
  * @param change
  * @param email
- * @param fromEmail
  * @param fromName
- * @param patchSetInfo
  */
 {template .Merged kind="text"}
-  {$fromName} merged this change
-  {if $patchSetInfo.authorEmail != $fromEmail}
-    {sp}by {$patchSetInfo.authorName}
-  {/if}.
-
+  {$fromName} has submitted this change and it was merged.
   {if $email.changeUrl} ( {$email.changeUrl} ){/if}{\n}
   {\n}
   Change subject: {$change.subject}{\n}

resources/com/google/gerrit/server/mail/MergedHtml.soy

@@ -19,16 +19,11 @@
 /**
  * @param diffLines
  * @param email
- * @param fromEmail
  * @param fromName
- * @param patchSetInfo
  */
 {template .MergedHtml}
   <p>
-    {$fromName} <strong>merged</strong> this change
-    {if $patchSetInfo.authorEmail != $fromEmail}
-      {sp}by {$patchSetInfo.authorName}
-    {/if}.
+    {$fromName} <strong>merged</strong> this change.
   </p>
 
   {if $email.changeUrl}