Bug 1314023 - Add dev edition branding exceptions to allowed duplicates r=Tomcat

MozReview-Commit-ID: 2Szg0XRURqM

--HG--
extra : rebase_source : 028effc8c95bc28bde4bb405595337222d3615c5

browser/installer/allowed-dupes.mn

@@ -220,3 +220,7 @@ res/table-remove-column.gif
 res/table-remove-row-active.gif
 res/table-remove-row-hover.gif
 res/table-remove-row.gif
+# Aurora branding
+browser/chrome/browser/content/browser/defaultthemes/devedition.icon.png
+browser/chrome/browser/content/branding/icon64.png
+browser/chrome/devtools/content/framework/dev-edition-promo/dev-edition-logo.png

mobile/android/installer/allowed-dupes.mn

@@ -117,3 +117,5 @@ res/table-remove-column.gif
 res/table-remove-row-active.gif
 res/table-remove-row-hover.gif
 res/table-remove-row.gif
+modules/commonjs/index.js
+chrome/toolkit/content/global/XPCNativeWrapper.js