summaryrefslogtreecommitdiffstats
path: root/mobile/android/branding
diff options
context:
space:
mode:
authorMatt A. Tobin <mattatobin@localhost.localdomain>2018-02-02 04:16:08 -0500
committerMatt A. Tobin <mattatobin@localhost.localdomain>2018-02-02 04:16:08 -0500
commit5f8de423f190bbb79a62f804151bc24824fa32d8 (patch)
tree10027f336435511475e392454359edea8e25895d /mobile/android/branding
parent49ee0794b5d912db1f95dce6eb52d781dc210db5 (diff)
downloadUXP-5f8de423f190bbb79a62f804151bc24824fa32d8.tar
UXP-5f8de423f190bbb79a62f804151bc24824fa32d8.tar.gz
UXP-5f8de423f190bbb79a62f804151bc24824fa32d8.tar.lz
UXP-5f8de423f190bbb79a62f804151bc24824fa32d8.tar.xz
UXP-5f8de423f190bbb79a62f804151bc24824fa32d8.zip
Add m-esr52 at 52.6.0
Diffstat (limited to 'mobile/android/branding')
-rw-r--r--mobile/android/branding/aurora/configure.sh10
-rw-r--r--mobile/android/branding/aurora/content/about.pngbin0 -> 18490 bytes
-rw-r--r--mobile/android/branding/aurora/content/favicon32.pngbin0 -> 2554 bytes
-rw-r--r--mobile/android/branding/aurora/content/favicon64.pngbin0 -> 7298 bytes
-rw-r--r--mobile/android/branding/aurora/content/jar.mn9
-rw-r--r--mobile/android/branding/aurora/content/moz.build7
-rw-r--r--mobile/android/branding/aurora/locales/en-US/brand.dtd7
-rw-r--r--mobile/android/branding/aurora/locales/en-US/brand.properties6
-rw-r--r--mobile/android/branding/aurora/locales/jar.mn11
-rw-r--r--mobile/android/branding/aurora/locales/moz.build7
-rw-r--r--mobile/android/branding/aurora/moz.build7
-rw-r--r--mobile/android/branding/aurora/res/drawable-hdpi/icon.pngbin0 -> 8661 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-hdpi/large_icon.pngbin0 -> 23595 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-hdpi/launcher_widget.pngbin0 -> 13139 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-hdpi/widget_icon.pngbin0 -> 6172 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-xhdpi/icon.pngbin0 -> 14754 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-xhdpi/large_icon.pngbin0 -> 42771 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-xhdpi/launcher_widget.pngbin0 -> 20101 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-xhdpi/widget_icon.pngbin0 -> 10097 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-xxhdpi/icon.pngbin0 -> 23595 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-xxhdpi/large_icon.pngbin0 -> 26247 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-xxhdpi/launcher_widget.pngbin0 -> 30058 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-xxhdpi/widget_icon.pngbin0 -> 20543 bytes
-rw-r--r--mobile/android/branding/aurora/res/drawable-xxxhdpi/icon.pngbin0 -> 42775 bytes
-rw-r--r--mobile/android/branding/beta/configure.sh10
-rw-r--r--mobile/android/branding/beta/content/about.pngbin0 -> 20047 bytes
-rw-r--r--mobile/android/branding/beta/content/favicon32.pngbin0 -> 2361 bytes
-rw-r--r--mobile/android/branding/beta/content/favicon64.pngbin0 -> 6632 bytes
-rw-r--r--mobile/android/branding/beta/content/jar.mn9
-rw-r--r--mobile/android/branding/beta/content/moz.build7
-rw-r--r--mobile/android/branding/beta/locales/en-US/brand.dtd7
-rw-r--r--mobile/android/branding/beta/locales/en-US/brand.properties6
-rw-r--r--mobile/android/branding/beta/locales/jar.mn11
-rw-r--r--mobile/android/branding/beta/locales/moz.build7
-rw-r--r--mobile/android/branding/beta/moz.build7
-rw-r--r--mobile/android/branding/beta/res/drawable-hdpi/icon.pngbin0 -> 7327 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-hdpi/large_icon.pngbin0 -> 18707 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-hdpi/launcher_widget.pngbin0 -> 13836 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-hdpi/widget_icon.pngbin0 -> 6514 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-xhdpi/icon.pngbin0 -> 14223 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-xhdpi/large_icon.pngbin0 -> 36645 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-xhdpi/launcher_widget.pngbin0 -> 20826 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-xhdpi/widget_icon.pngbin0 -> 9929 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-xxhdpi/icon.pngbin0 -> 18707 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-xxhdpi/large_icon.pngbin0 -> 18461 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-xxhdpi/launcher_widget.pngbin0 -> 37201 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-xxhdpi/widget_icon.pngbin0 -> 17359 bytes
-rw-r--r--mobile/android/branding/beta/res/drawable-xxxhdpi/icon.pngbin0 -> 36668 bytes
-rw-r--r--mobile/android/branding/nightly/configure.sh9
-rw-r--r--mobile/android/branding/nightly/content/about.pngbin0 -> 18175 bytes
-rw-r--r--mobile/android/branding/nightly/content/favicon32.pngbin0 -> 2470 bytes
-rw-r--r--mobile/android/branding/nightly/content/favicon64.pngbin0 -> 6981 bytes
-rw-r--r--mobile/android/branding/nightly/content/jar.mn9
-rw-r--r--mobile/android/branding/nightly/content/moz.build7
-rw-r--r--mobile/android/branding/nightly/locales/en-US/brand.dtd7
-rw-r--r--mobile/android/branding/nightly/locales/en-US/brand.properties6
-rw-r--r--mobile/android/branding/nightly/locales/jar.mn11
-rw-r--r--mobile/android/branding/nightly/locales/moz.build7
-rw-r--r--mobile/android/branding/nightly/moz.build7
-rw-r--r--mobile/android/branding/nightly/res/drawable-hdpi/icon.pngbin0 -> 8156 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-hdpi/large_icon.pngbin0 -> 21673 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-hdpi/launcher_widget.pngbin0 -> 13139 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-hdpi/widget_icon.pngbin0 -> 3043 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-xhdpi/icon.pngbin0 -> 14195 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-xhdpi/large_icon.pngbin0 -> 40712 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-xhdpi/launcher_widget.pngbin0 -> 20101 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-xhdpi/widget_icon.pngbin0 -> 4259 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-xxhdpi/icon.pngbin0 -> 21649 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-xxhdpi/large_icon.pngbin0 -> 26957 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-xxhdpi/launcher_widget.pngbin0 -> 30058 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-xxhdpi/widget_icon.pngbin0 -> 6968 bytes
-rw-r--r--mobile/android/branding/nightly/res/drawable-xxxhdpi/icon.pngbin0 -> 40615 bytes
-rw-r--r--mobile/android/branding/official/configure.sh10
-rw-r--r--mobile/android/branding/official/content/about.pngbin0 -> 20047 bytes
-rw-r--r--mobile/android/branding/official/content/favicon32.pngbin0 -> 2361 bytes
-rw-r--r--mobile/android/branding/official/content/favicon64.pngbin0 -> 6628 bytes
-rw-r--r--mobile/android/branding/official/content/jar.mn9
-rw-r--r--mobile/android/branding/official/content/moz.build7
-rw-r--r--mobile/android/branding/official/locales/en-US/brand.dtd7
-rw-r--r--mobile/android/branding/official/locales/en-US/brand.properties6
-rw-r--r--mobile/android/branding/official/locales/jar.mn11
-rw-r--r--mobile/android/branding/official/locales/moz.build7
-rw-r--r--mobile/android/branding/official/moz.build7
-rw-r--r--mobile/android/branding/official/res/drawable-hdpi/icon.pngbin0 -> 7902 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-hdpi/large_icon.pngbin0 -> 21306 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-hdpi/launcher_widget.pngbin0 -> 13305 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-hdpi/widget_icon.pngbin0 -> 5977 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-xhdpi/icon.pngbin0 -> 13891 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-xhdpi/large_icon.pngbin0 -> 37644 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-xhdpi/launcher_widget.pngbin0 -> 20302 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-xhdpi/widget_icon.pngbin0 -> 9193 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-xxhdpi/icon.pngbin0 -> 21306 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-xxhdpi/large_icon.pngbin0 -> 21556 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-xxhdpi/launcher_widget.pngbin0 -> 29503 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-xxhdpi/widget_icon.pngbin0 -> 16737 bytes
-rw-r--r--mobile/android/branding/official/res/drawable-xxxhdpi/icon.pngbin0 -> 37610 bytes
-rw-r--r--mobile/android/branding/unofficial/configure.sh9
-rw-r--r--mobile/android/branding/unofficial/content/about.pngbin0 -> 13042 bytes
-rw-r--r--mobile/android/branding/unofficial/content/favicon32.pngbin0 -> 1558 bytes
-rw-r--r--mobile/android/branding/unofficial/content/favicon64.pngbin0 -> 5677 bytes
-rw-r--r--mobile/android/branding/unofficial/content/jar.mn9
-rw-r--r--mobile/android/branding/unofficial/content/moz.build7
-rw-r--r--mobile/android/branding/unofficial/locales/en-US/brand.dtd7
-rw-r--r--mobile/android/branding/unofficial/locales/en-US/brand.properties6
-rw-r--r--mobile/android/branding/unofficial/locales/jar.mn11
-rw-r--r--mobile/android/branding/unofficial/locales/moz.build7
-rw-r--r--mobile/android/branding/unofficial/moz.build7
-rw-r--r--mobile/android/branding/unofficial/res/drawable-hdpi/icon.pngbin0 -> 6498 bytes
-rw-r--r--mobile/android/branding/unofficial/res/drawable-hdpi/large_icon.pngbin0 -> 17583 bytes
-rw-r--r--mobile/android/branding/unofficial/res/drawable-hdpi/launcher_widget.pngbin0 -> 13139 bytes
-rw-r--r--mobile/android/branding/unofficial/res/drawable-xhdpi/icon.pngbin0 -> 10371 bytes
-rw-r--r--mobile/android/branding/unofficial/res/drawable-xhdpi/large_icon.pngbin0 -> 17583 bytes
-rw-r--r--mobile/android/branding/unofficial/res/drawable-xhdpi/launcher_widget.pngbin0 -> 20101 bytes
-rw-r--r--mobile/android/branding/unofficial/res/drawable-xhdpi/widget_icon.pngbin0 -> 4252 bytes
-rw-r--r--mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.pngbin0 -> 17583 bytes
-rw-r--r--mobile/android/branding/unofficial/res/drawable-xxhdpi/large_icon.pngbin0 -> 17583 bytes
-rw-r--r--mobile/android/branding/unofficial/res/drawable-xxhdpi/launcher_widget.pngbin0 -> 30058 bytes
117 files changed, 318 insertions, 0 deletions
diff --git a/mobile/android/branding/aurora/configure.sh b/mobile/android/branding/aurora/configure.sh
new file mode 100644
index 000000000..39b9e15c3
--- /dev/null
+++ b/mobile/android/branding/aurora/configure.sh
@@ -0,0 +1,10 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+MOZ_APP_DISPLAYNAME="Firefox Aurora"
+ANDROID_PACKAGE_NAME=org.mozilla.fennec_aurora
+MOZ_UPDATER=1
+MOZ_ANDROID_ANR_REPORTER=1
+MOZ_ANDROID_SHARED_ID=org.mozilla.fennec.sharedID
+MOZ_ANDROID_GCM_SENDERID=965234145045
diff --git a/mobile/android/branding/aurora/content/about.png b/mobile/android/branding/aurora/content/about.png
new file mode 100644
index 000000000..3779bd120
--- /dev/null
+++ b/mobile/android/branding/aurora/content/about.png
Binary files differ
diff --git a/mobile/android/branding/aurora/content/favicon32.png b/mobile/android/branding/aurora/content/favicon32.png
new file mode 100644
index 000000000..defb22717
--- /dev/null
+++ b/mobile/android/branding/aurora/content/favicon32.png
Binary files differ
diff --git a/mobile/android/branding/aurora/content/favicon64.png b/mobile/android/branding/aurora/content/favicon64.png
new file mode 100644
index 000000000..163782abf
--- /dev/null
+++ b/mobile/android/branding/aurora/content/favicon64.png
Binary files differ
diff --git a/mobile/android/branding/aurora/content/jar.mn b/mobile/android/branding/aurora/content/jar.mn
new file mode 100644
index 000000000..e49cc4041
--- /dev/null
+++ b/mobile/android/branding/aurora/content/jar.mn
@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+chrome.jar:
+% content branding %content/branding/ contentaccessible=yes
+ content/branding/about.png (about.png)
+ content/branding/favicon32.png (favicon32.png)
+ content/branding/favicon64.png (favicon64.png)
diff --git a/mobile/android/branding/aurora/content/moz.build b/mobile/android/branding/aurora/content/moz.build
new file mode 100644
index 000000000..eb4454d28
--- /dev/null
+++ b/mobile/android/branding/aurora/content/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file
diff --git a/mobile/android/branding/aurora/locales/en-US/brand.dtd b/mobile/android/branding/aurora/locales/en-US/brand.dtd
new file mode 100644
index 000000000..a6cada676
--- /dev/null
+++ b/mobile/android/branding/aurora/locales/en-US/brand.dtd
@@ -0,0 +1,7 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY brandShortName "Firefox Aurora">
+<!ENTITY brandFullName "Mozilla Firefox Aurora">
+<!ENTITY vendorShortName "Mozilla"> \ No newline at end of file
diff --git a/mobile/android/branding/aurora/locales/en-US/brand.properties b/mobile/android/branding/aurora/locales/en-US/brand.properties
new file mode 100644
index 000000000..fc4afd6d5
--- /dev/null
+++ b/mobile/android/branding/aurora/locales/en-US/brand.properties
@@ -0,0 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+brandShortName=Aurora
+brandFullName=Mozilla Aurora
diff --git a/mobile/android/branding/aurora/locales/jar.mn b/mobile/android/branding/aurora/locales/jar.mn
new file mode 100644
index 000000000..5a77695c9
--- /dev/null
+++ b/mobile/android/branding/aurora/locales/jar.mn
@@ -0,0 +1,11 @@
+#filter substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+@AB_CD@.jar:
+% locale branding @AB_CD@ %locale/branding/
+# Nightly branding only exists in en-US
+ locale/branding/brand.dtd (en-US/brand.dtd)
+ locale/branding/brand.properties (en-US/brand.properties)
diff --git a/mobile/android/branding/aurora/locales/moz.build b/mobile/android/branding/aurora/locales/moz.build
new file mode 100644
index 000000000..eb4454d28
--- /dev/null
+++ b/mobile/android/branding/aurora/locales/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file
diff --git a/mobile/android/branding/aurora/moz.build b/mobile/android/branding/aurora/moz.build
new file mode 100644
index 000000000..04084b1ac
--- /dev/null
+++ b/mobile/android/branding/aurora/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += ['content', 'locales']
diff --git a/mobile/android/branding/aurora/res/drawable-hdpi/icon.png b/mobile/android/branding/aurora/res/drawable-hdpi/icon.png
new file mode 100644
index 000000000..17748ed5e
--- /dev/null
+++ b/mobile/android/branding/aurora/res/drawable-hdpi/icon.png
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-hdpi/large_icon.png b/mobile/android/branding/aurora/res/drawable-hdpi/large_icon.png
new file mode 100644
index 000000000..229ad5e0f
--- /dev/null
+++ b/mobile/android/branding/aurora/res/drawable-hdpi/large_icon.png
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-hdpi/launcher_widget.png b/mobile/android/branding/aurora/res/drawable-hdpi/launcher_widget.png
new file mode 100644
index 000000000..8e55b0c11
--- /dev/null
+++ b/mobile/android/branding/aurora/res/drawable-hdpi/launcher_widget.png
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-hdpi/widget_icon.png b/mobile/android/branding/aurora/res/drawable-hdpi/widget_icon.png
new file mode 100644
index 000000000..39fdb8204
--- /dev/null
+++ b/mobile/android/branding/aurora/res/drawable-hdpi/widget_icon.png
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-xhdpi/icon.png b/mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
new file mode 100644
index 000000000..51c54bf37
--- /dev/null
+++ b/mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-xhdpi/large_icon.png b/mobile/android/branding/aurora/res/drawable-xhdpi/large_icon.png
new file mode 100644
index 000000000..78e94d30a
--- /dev/null
+++ b/mobile/android/branding/aurora/res/drawable-xhdpi/large_icon.png
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-xhdpi/launcher_widget.png b/mobile/android/branding/aurora/res/drawable-xhdpi/launcher_widget.png
new file mode 100644
index 000000000..56f47446a
--- /dev/null
+++ b/mobile/android/branding/aurora/res/drawable-xhdpi/launcher_widget.png
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-xhdpi/widget_icon.png b/mobile/android/branding/aurora/res/drawable-xhdpi/widget_icon.png
new file mode 100644
index 000000000..74e6f8aea
--- /dev/null
+++ b/mobile/android/branding/aurora/res/drawable-xhdpi/widget_icon.png
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png b/mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
new file mode 100644
index 000000000..229ad5e0f
--- /dev/null
+++ b/mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-xxhdpi/large_icon.png b/mobile/android/branding/aurora/res/drawable-xxhdpi/large_icon.png
new file mode 100644
index 000000000..5b439392e
--- /dev/null
+++ b/mobile/android/branding/aurora/res/drawable-xxhdpi/large_icon.png
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-xxhdpi/launcher_widget.png b/mobile/android/branding/aurora/res/drawable-xxhdpi/launcher_widget.png
new file mode 100644
index 000000000..eb88984db
--- /dev/null
+++ b/mobile/android/branding/aurora/res/drawable-xxhdpi/launcher_widget.png
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-xxhdpi/widget_icon.png b/mobile/android/branding/aurora/res/drawable-xxhdpi/widget_icon.png
new file mode 100644
index 000000000..bb651922f
--- /dev/null
+++ b/mobile/android/branding/aurora/res/drawable-xxhdpi/widget_icon.png
Binary files differ
diff --git a/mobile/android/branding/aurora/res/drawable-xxxhdpi/icon.png b/mobile/android/branding/aurora/res/drawable-xxxhdpi/icon.png
new file mode 100644
index 000000000..27f63fc24
--- /dev/null
+++ b/mobile/android/branding/aurora/res/drawable-xxxhdpi/icon.png
Binary files differ
diff --git a/mobile/android/branding/beta/configure.sh b/mobile/android/branding/beta/configure.sh
new file mode 100644
index 000000000..b8c442a7c
--- /dev/null
+++ b/mobile/android/branding/beta/configure.sh
@@ -0,0 +1,10 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+MOZ_APP_DISPLAYNAME="Firefox Beta"
+ANDROID_PACKAGE_NAME=org.mozilla.firefox_beta
+MOZ_UPDATER=
+MOZ_ANDROID_ANR_REPORTER=
+MOZ_ANDROID_SHARED_ID=org.mozilla.firefox.sharedID
+MOZ_ANDROID_GCM_SENDERID=965234145045
diff --git a/mobile/android/branding/beta/content/about.png b/mobile/android/branding/beta/content/about.png
new file mode 100644
index 000000000..dc52e843b
--- /dev/null
+++ b/mobile/android/branding/beta/content/about.png
Binary files differ
diff --git a/mobile/android/branding/beta/content/favicon32.png b/mobile/android/branding/beta/content/favicon32.png
new file mode 100644
index 000000000..63b54a247
--- /dev/null
+++ b/mobile/android/branding/beta/content/favicon32.png
Binary files differ
diff --git a/mobile/android/branding/beta/content/favicon64.png b/mobile/android/branding/beta/content/favicon64.png
new file mode 100644
index 000000000..2a9eb30d8
--- /dev/null
+++ b/mobile/android/branding/beta/content/favicon64.png
Binary files differ
diff --git a/mobile/android/branding/beta/content/jar.mn b/mobile/android/branding/beta/content/jar.mn
new file mode 100644
index 000000000..e49cc4041
--- /dev/null
+++ b/mobile/android/branding/beta/content/jar.mn
@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+chrome.jar:
+% content branding %content/branding/ contentaccessible=yes
+ content/branding/about.png (about.png)
+ content/branding/favicon32.png (favicon32.png)
+ content/branding/favicon64.png (favicon64.png)
diff --git a/mobile/android/branding/beta/content/moz.build b/mobile/android/branding/beta/content/moz.build
new file mode 100644
index 000000000..eb4454d28
--- /dev/null
+++ b/mobile/android/branding/beta/content/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file
diff --git a/mobile/android/branding/beta/locales/en-US/brand.dtd b/mobile/android/branding/beta/locales/en-US/brand.dtd
new file mode 100644
index 000000000..4eb8febf0
--- /dev/null
+++ b/mobile/android/branding/beta/locales/en-US/brand.dtd
@@ -0,0 +1,7 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY brandShortName "Firefox Beta">
+<!ENTITY brandFullName "Mozilla Firefox Beta">
+<!ENTITY vendorShortName "Mozilla"> \ No newline at end of file
diff --git a/mobile/android/branding/beta/locales/en-US/brand.properties b/mobile/android/branding/beta/locales/en-US/brand.properties
new file mode 100644
index 000000000..8d8a8b8e3
--- /dev/null
+++ b/mobile/android/branding/beta/locales/en-US/brand.properties
@@ -0,0 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+brandShortName=Firefox Beta
+brandFullName=Mozilla Firefox Beta
diff --git a/mobile/android/branding/beta/locales/jar.mn b/mobile/android/branding/beta/locales/jar.mn
new file mode 100644
index 000000000..2ea47e168
--- /dev/null
+++ b/mobile/android/branding/beta/locales/jar.mn
@@ -0,0 +1,11 @@
+#filter substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+@AB_CD@.jar:
+% locale branding @AB_CD@ %locale/branding/
+# Branding only exists in en-US
+ locale/branding/brand.dtd (en-US/brand.dtd)
+ locale/branding/brand.properties (en-US/brand.properties)
diff --git a/mobile/android/branding/beta/locales/moz.build b/mobile/android/branding/beta/locales/moz.build
new file mode 100644
index 000000000..eb4454d28
--- /dev/null
+++ b/mobile/android/branding/beta/locales/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file
diff --git a/mobile/android/branding/beta/moz.build b/mobile/android/branding/beta/moz.build
new file mode 100644
index 000000000..04084b1ac
--- /dev/null
+++ b/mobile/android/branding/beta/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += ['content', 'locales']
diff --git a/mobile/android/branding/beta/res/drawable-hdpi/icon.png b/mobile/android/branding/beta/res/drawable-hdpi/icon.png
new file mode 100644
index 000000000..fc450d0fd
--- /dev/null
+++ b/mobile/android/branding/beta/res/drawable-hdpi/icon.png
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-hdpi/large_icon.png b/mobile/android/branding/beta/res/drawable-hdpi/large_icon.png
new file mode 100644
index 000000000..8b7f313fb
--- /dev/null
+++ b/mobile/android/branding/beta/res/drawable-hdpi/large_icon.png
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-hdpi/launcher_widget.png b/mobile/android/branding/beta/res/drawable-hdpi/launcher_widget.png
new file mode 100644
index 000000000..ba8ba8eed
--- /dev/null
+++ b/mobile/android/branding/beta/res/drawable-hdpi/launcher_widget.png
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-hdpi/widget_icon.png b/mobile/android/branding/beta/res/drawable-hdpi/widget_icon.png
new file mode 100644
index 000000000..8c60639e2
--- /dev/null
+++ b/mobile/android/branding/beta/res/drawable-hdpi/widget_icon.png
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-xhdpi/icon.png b/mobile/android/branding/beta/res/drawable-xhdpi/icon.png
new file mode 100644
index 000000000..7c2af7a0c
--- /dev/null
+++ b/mobile/android/branding/beta/res/drawable-xhdpi/icon.png
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-xhdpi/large_icon.png b/mobile/android/branding/beta/res/drawable-xhdpi/large_icon.png
new file mode 100644
index 000000000..638d6b5d7
--- /dev/null
+++ b/mobile/android/branding/beta/res/drawable-xhdpi/large_icon.png
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-xhdpi/launcher_widget.png b/mobile/android/branding/beta/res/drawable-xhdpi/launcher_widget.png
new file mode 100644
index 000000000..d15d5b91e
--- /dev/null
+++ b/mobile/android/branding/beta/res/drawable-xhdpi/launcher_widget.png
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-xhdpi/widget_icon.png b/mobile/android/branding/beta/res/drawable-xhdpi/widget_icon.png
new file mode 100644
index 000000000..5ec6b038e
--- /dev/null
+++ b/mobile/android/branding/beta/res/drawable-xhdpi/widget_icon.png
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-xxhdpi/icon.png b/mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
new file mode 100644
index 000000000..8b7f313fb
--- /dev/null
+++ b/mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-xxhdpi/large_icon.png b/mobile/android/branding/beta/res/drawable-xxhdpi/large_icon.png
new file mode 100644
index 000000000..6a25ee0f0
--- /dev/null
+++ b/mobile/android/branding/beta/res/drawable-xxhdpi/large_icon.png
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-xxhdpi/launcher_widget.png b/mobile/android/branding/beta/res/drawable-xxhdpi/launcher_widget.png
new file mode 100644
index 000000000..df75a5b2f
--- /dev/null
+++ b/mobile/android/branding/beta/res/drawable-xxhdpi/launcher_widget.png
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-xxhdpi/widget_icon.png b/mobile/android/branding/beta/res/drawable-xxhdpi/widget_icon.png
new file mode 100644
index 000000000..c4d71316e
--- /dev/null
+++ b/mobile/android/branding/beta/res/drawable-xxhdpi/widget_icon.png
Binary files differ
diff --git a/mobile/android/branding/beta/res/drawable-xxxhdpi/icon.png b/mobile/android/branding/beta/res/drawable-xxxhdpi/icon.png
new file mode 100644
index 000000000..57c81f22c
--- /dev/null
+++ b/mobile/android/branding/beta/res/drawable-xxxhdpi/icon.png
Binary files differ
diff --git a/mobile/android/branding/nightly/configure.sh b/mobile/android/branding/nightly/configure.sh
new file mode 100644
index 000000000..399de4c88
--- /dev/null
+++ b/mobile/android/branding/nightly/configure.sh
@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+MOZ_APP_DISPLAYNAME=Nightly
+MOZ_UPDATER=1
+MOZ_ANDROID_ANR_REPORTER=1
+MOZ_ANDROID_SHARED_ID=org.mozilla.fennec.sharedID
+MOZ_ANDROID_GCM_SENDERID=965234145045
diff --git a/mobile/android/branding/nightly/content/about.png b/mobile/android/branding/nightly/content/about.png
new file mode 100644
index 000000000..d6602ec62
--- /dev/null
+++ b/mobile/android/branding/nightly/content/about.png
Binary files differ
diff --git a/mobile/android/branding/nightly/content/favicon32.png b/mobile/android/branding/nightly/content/favicon32.png
new file mode 100644
index 000000000..6cf3db69a
--- /dev/null
+++ b/mobile/android/branding/nightly/content/favicon32.png
Binary files differ
diff --git a/mobile/android/branding/nightly/content/favicon64.png b/mobile/android/branding/nightly/content/favicon64.png
new file mode 100644
index 000000000..ab340837e
--- /dev/null
+++ b/mobile/android/branding/nightly/content/favicon64.png
Binary files differ
diff --git a/mobile/android/branding/nightly/content/jar.mn b/mobile/android/branding/nightly/content/jar.mn
new file mode 100644
index 000000000..e49cc4041
--- /dev/null
+++ b/mobile/android/branding/nightly/content/jar.mn
@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+chrome.jar:
+% content branding %content/branding/ contentaccessible=yes
+ content/branding/about.png (about.png)
+ content/branding/favicon32.png (favicon32.png)
+ content/branding/favicon64.png (favicon64.png)
diff --git a/mobile/android/branding/nightly/content/moz.build b/mobile/android/branding/nightly/content/moz.build
new file mode 100644
index 000000000..eb4454d28
--- /dev/null
+++ b/mobile/android/branding/nightly/content/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file
diff --git a/mobile/android/branding/nightly/locales/en-US/brand.dtd b/mobile/android/branding/nightly/locales/en-US/brand.dtd
new file mode 100644
index 000000000..3d3a3a10f
--- /dev/null
+++ b/mobile/android/branding/nightly/locales/en-US/brand.dtd
@@ -0,0 +1,7 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY brandShortName "Nightly">
+<!ENTITY brandFullName "Mozilla Nightly">
+<!ENTITY vendorShortName "Mozilla"> \ No newline at end of file
diff --git a/mobile/android/branding/nightly/locales/en-US/brand.properties b/mobile/android/branding/nightly/locales/en-US/brand.properties
new file mode 100644
index 000000000..d06053614
--- /dev/null
+++ b/mobile/android/branding/nightly/locales/en-US/brand.properties
@@ -0,0 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+brandShortName=Nightly
+brandFullName=Mozilla Nightly
diff --git a/mobile/android/branding/nightly/locales/jar.mn b/mobile/android/branding/nightly/locales/jar.mn
new file mode 100644
index 000000000..5a77695c9
--- /dev/null
+++ b/mobile/android/branding/nightly/locales/jar.mn
@@ -0,0 +1,11 @@
+#filter substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+@AB_CD@.jar:
+% locale branding @AB_CD@ %locale/branding/
+# Nightly branding only exists in en-US
+ locale/branding/brand.dtd (en-US/brand.dtd)
+ locale/branding/brand.properties (en-US/brand.properties)
diff --git a/mobile/android/branding/nightly/locales/moz.build b/mobile/android/branding/nightly/locales/moz.build
new file mode 100644
index 000000000..eb4454d28
--- /dev/null
+++ b/mobile/android/branding/nightly/locales/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file
diff --git a/mobile/android/branding/nightly/moz.build b/mobile/android/branding/nightly/moz.build
new file mode 100644
index 000000000..04084b1ac
--- /dev/null
+++ b/mobile/android/branding/nightly/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += ['content', 'locales']
diff --git a/mobile/android/branding/nightly/res/drawable-hdpi/icon.png b/mobile/android/branding/nightly/res/drawable-hdpi/icon.png
new file mode 100644
index 000000000..bb87f783b
--- /dev/null
+++ b/mobile/android/branding/nightly/res/drawable-hdpi/icon.png
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-hdpi/large_icon.png b/mobile/android/branding/nightly/res/drawable-hdpi/large_icon.png
new file mode 100644
index 000000000..0907bbcf1
--- /dev/null
+++ b/mobile/android/branding/nightly/res/drawable-hdpi/large_icon.png
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-hdpi/launcher_widget.png b/mobile/android/branding/nightly/res/drawable-hdpi/launcher_widget.png
new file mode 100644
index 000000000..8e55b0c11
--- /dev/null
+++ b/mobile/android/branding/nightly/res/drawable-hdpi/launcher_widget.png
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-hdpi/widget_icon.png b/mobile/android/branding/nightly/res/drawable-hdpi/widget_icon.png
new file mode 100644
index 000000000..f46e29c75
--- /dev/null
+++ b/mobile/android/branding/nightly/res/drawable-hdpi/widget_icon.png
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-xhdpi/icon.png b/mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
new file mode 100644
index 000000000..bb78ad623
--- /dev/null
+++ b/mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-xhdpi/large_icon.png b/mobile/android/branding/nightly/res/drawable-xhdpi/large_icon.png
new file mode 100644
index 000000000..3a1f003ba
--- /dev/null
+++ b/mobile/android/branding/nightly/res/drawable-xhdpi/large_icon.png
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-xhdpi/launcher_widget.png b/mobile/android/branding/nightly/res/drawable-xhdpi/launcher_widget.png
new file mode 100644
index 000000000..56f47446a
--- /dev/null
+++ b/mobile/android/branding/nightly/res/drawable-xhdpi/launcher_widget.png
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-xhdpi/widget_icon.png b/mobile/android/branding/nightly/res/drawable-xhdpi/widget_icon.png
new file mode 100644
index 000000000..4413e0c78
--- /dev/null
+++ b/mobile/android/branding/nightly/res/drawable-xhdpi/widget_icon.png
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png b/mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
new file mode 100644
index 000000000..92c3df036
--- /dev/null
+++ b/mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-xxhdpi/large_icon.png b/mobile/android/branding/nightly/res/drawable-xxhdpi/large_icon.png
new file mode 100644
index 000000000..cae9ea289
--- /dev/null
+++ b/mobile/android/branding/nightly/res/drawable-xxhdpi/large_icon.png
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-xxhdpi/launcher_widget.png b/mobile/android/branding/nightly/res/drawable-xxhdpi/launcher_widget.png
new file mode 100644
index 000000000..eb88984db
--- /dev/null
+++ b/mobile/android/branding/nightly/res/drawable-xxhdpi/launcher_widget.png
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-xxhdpi/widget_icon.png b/mobile/android/branding/nightly/res/drawable-xxhdpi/widget_icon.png
new file mode 100644
index 000000000..43b679b65
--- /dev/null
+++ b/mobile/android/branding/nightly/res/drawable-xxhdpi/widget_icon.png
Binary files differ
diff --git a/mobile/android/branding/nightly/res/drawable-xxxhdpi/icon.png b/mobile/android/branding/nightly/res/drawable-xxxhdpi/icon.png
new file mode 100644
index 000000000..abd62f1fc
--- /dev/null
+++ b/mobile/android/branding/nightly/res/drawable-xxxhdpi/icon.png
Binary files differ
diff --git a/mobile/android/branding/official/configure.sh b/mobile/android/branding/official/configure.sh
new file mode 100644
index 000000000..b36e083f9
--- /dev/null
+++ b/mobile/android/branding/official/configure.sh
@@ -0,0 +1,10 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+MOZ_APP_DISPLAYNAME=Firefox
+ANDROID_PACKAGE_NAME=org.mozilla.firefox
+MOZ_UPDATER=
+MOZ_ANDROID_ANR_REPORTER=
+MOZ_ANDROID_SHARED_ID=org.mozilla.firefox.sharedID
+MOZ_ANDROID_GCM_SENDERID=965234145045
diff --git a/mobile/android/branding/official/content/about.png b/mobile/android/branding/official/content/about.png
new file mode 100644
index 000000000..dc52e843b
--- /dev/null
+++ b/mobile/android/branding/official/content/about.png
Binary files differ
diff --git a/mobile/android/branding/official/content/favicon32.png b/mobile/android/branding/official/content/favicon32.png
new file mode 100644
index 000000000..63b54a247
--- /dev/null
+++ b/mobile/android/branding/official/content/favicon32.png
Binary files differ
diff --git a/mobile/android/branding/official/content/favicon64.png b/mobile/android/branding/official/content/favicon64.png
new file mode 100644
index 000000000..e11693d6c
--- /dev/null
+++ b/mobile/android/branding/official/content/favicon64.png
Binary files differ
diff --git a/mobile/android/branding/official/content/jar.mn b/mobile/android/branding/official/content/jar.mn
new file mode 100644
index 000000000..e49cc4041
--- /dev/null
+++ b/mobile/android/branding/official/content/jar.mn
@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+chrome.jar:
+% content branding %content/branding/ contentaccessible=yes
+ content/branding/about.png (about.png)
+ content/branding/favicon32.png (favicon32.png)
+ content/branding/favicon64.png (favicon64.png)
diff --git a/mobile/android/branding/official/content/moz.build b/mobile/android/branding/official/content/moz.build
new file mode 100644
index 000000000..eb4454d28
--- /dev/null
+++ b/mobile/android/branding/official/content/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file
diff --git a/mobile/android/branding/official/locales/en-US/brand.dtd b/mobile/android/branding/official/locales/en-US/brand.dtd
new file mode 100644
index 000000000..b2b28a49a
--- /dev/null
+++ b/mobile/android/branding/official/locales/en-US/brand.dtd
@@ -0,0 +1,7 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY brandShortName "Firefox">
+<!ENTITY brandFullName "Mozilla Firefox">
+<!ENTITY vendorShortName "Mozilla"> \ No newline at end of file
diff --git a/mobile/android/branding/official/locales/en-US/brand.properties b/mobile/android/branding/official/locales/en-US/brand.properties
new file mode 100644
index 000000000..d0203e35a
--- /dev/null
+++ b/mobile/android/branding/official/locales/en-US/brand.properties
@@ -0,0 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+brandShortName=Firefox
+brandFullName=Mozilla Firefox
diff --git a/mobile/android/branding/official/locales/jar.mn b/mobile/android/branding/official/locales/jar.mn
new file mode 100644
index 000000000..2ea47e168
--- /dev/null
+++ b/mobile/android/branding/official/locales/jar.mn
@@ -0,0 +1,11 @@
+#filter substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+@AB_CD@.jar:
+% locale branding @AB_CD@ %locale/branding/
+# Branding only exists in en-US
+ locale/branding/brand.dtd (en-US/brand.dtd)
+ locale/branding/brand.properties (en-US/brand.properties)
diff --git a/mobile/android/branding/official/locales/moz.build b/mobile/android/branding/official/locales/moz.build
new file mode 100644
index 000000000..eb4454d28
--- /dev/null
+++ b/mobile/android/branding/official/locales/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file
diff --git a/mobile/android/branding/official/moz.build b/mobile/android/branding/official/moz.build
new file mode 100644
index 000000000..04084b1ac
--- /dev/null
+++ b/mobile/android/branding/official/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += ['content', 'locales']
diff --git a/mobile/android/branding/official/res/drawable-hdpi/icon.png b/mobile/android/branding/official/res/drawable-hdpi/icon.png
new file mode 100644
index 000000000..de9052a10
--- /dev/null
+++ b/mobile/android/branding/official/res/drawable-hdpi/icon.png
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-hdpi/large_icon.png b/mobile/android/branding/official/res/drawable-hdpi/large_icon.png
new file mode 100644
index 000000000..b14cd3d81
--- /dev/null
+++ b/mobile/android/branding/official/res/drawable-hdpi/large_icon.png
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-hdpi/launcher_widget.png b/mobile/android/branding/official/res/drawable-hdpi/launcher_widget.png
new file mode 100644
index 000000000..2528f4b35
--- /dev/null
+++ b/mobile/android/branding/official/res/drawable-hdpi/launcher_widget.png
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-hdpi/widget_icon.png b/mobile/android/branding/official/res/drawable-hdpi/widget_icon.png
new file mode 100644
index 000000000..02c88369b
--- /dev/null
+++ b/mobile/android/branding/official/res/drawable-hdpi/widget_icon.png
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-xhdpi/icon.png b/mobile/android/branding/official/res/drawable-xhdpi/icon.png
new file mode 100644
index 000000000..baee75b77
--- /dev/null
+++ b/mobile/android/branding/official/res/drawable-xhdpi/icon.png
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-xhdpi/large_icon.png b/mobile/android/branding/official/res/drawable-xhdpi/large_icon.png
new file mode 100644
index 000000000..20a8c28af
--- /dev/null
+++ b/mobile/android/branding/official/res/drawable-xhdpi/large_icon.png
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-xhdpi/launcher_widget.png b/mobile/android/branding/official/res/drawable-xhdpi/launcher_widget.png
new file mode 100644
index 000000000..a4d8bdaf5
--- /dev/null
+++ b/mobile/android/branding/official/res/drawable-xhdpi/launcher_widget.png
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-xhdpi/widget_icon.png b/mobile/android/branding/official/res/drawable-xhdpi/widget_icon.png
new file mode 100644
index 000000000..66b933d63
--- /dev/null
+++ b/mobile/android/branding/official/res/drawable-xhdpi/widget_icon.png
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-xxhdpi/icon.png b/mobile/android/branding/official/res/drawable-xxhdpi/icon.png
new file mode 100644
index 000000000..b14cd3d81
--- /dev/null
+++ b/mobile/android/branding/official/res/drawable-xxhdpi/icon.png
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-xxhdpi/large_icon.png b/mobile/android/branding/official/res/drawable-xxhdpi/large_icon.png
new file mode 100644
index 000000000..a37b9a83d
--- /dev/null
+++ b/mobile/android/branding/official/res/drawable-xxhdpi/large_icon.png
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-xxhdpi/launcher_widget.png b/mobile/android/branding/official/res/drawable-xxhdpi/launcher_widget.png
new file mode 100644
index 000000000..7a5470cb4
--- /dev/null
+++ b/mobile/android/branding/official/res/drawable-xxhdpi/launcher_widget.png
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-xxhdpi/widget_icon.png b/mobile/android/branding/official/res/drawable-xxhdpi/widget_icon.png
new file mode 100644
index 000000000..843ce03a0
--- /dev/null
+++ b/mobile/android/branding/official/res/drawable-xxhdpi/widget_icon.png
Binary files differ
diff --git a/mobile/android/branding/official/res/drawable-xxxhdpi/icon.png b/mobile/android/branding/official/res/drawable-xxxhdpi/icon.png
new file mode 100644
index 000000000..659a33ede
--- /dev/null
+++ b/mobile/android/branding/official/res/drawable-xxxhdpi/icon.png
Binary files differ
diff --git a/mobile/android/branding/unofficial/configure.sh b/mobile/android/branding/unofficial/configure.sh
new file mode 100644
index 000000000..0920151a5
--- /dev/null
+++ b/mobile/android/branding/unofficial/configure.sh
@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+ANDROID_PACKAGE_NAME=org.mozilla.fennec_`echo $USER | sed 's/-/_/g'`
+MOZ_APP_DISPLAYNAME="Fennec `echo $USER | sed 's/-/_/g'`"
+MOZ_UPDATER=
+MOZ_ANDROID_ANR_REPORTER=
+MOZ_ANDROID_GCM_SENDERID=965234145045
diff --git a/mobile/android/branding/unofficial/content/about.png b/mobile/android/branding/unofficial/content/about.png
new file mode 100644
index 000000000..e3f697e8d
--- /dev/null
+++ b/mobile/android/branding/unofficial/content/about.png
Binary files differ
diff --git a/mobile/android/branding/unofficial/content/favicon32.png b/mobile/android/branding/unofficial/content/favicon32.png
new file mode 100644
index 000000000..c43d5a229
--- /dev/null
+++ b/mobile/android/branding/unofficial/content/favicon32.png
Binary files differ
diff --git a/mobile/android/branding/unofficial/content/favicon64.png b/mobile/android/branding/unofficial/content/favicon64.png
new file mode 100644
index 000000000..895f60c15
--- /dev/null
+++ b/mobile/android/branding/unofficial/content/favicon64.png
Binary files differ
diff --git a/mobile/android/branding/unofficial/content/jar.mn b/mobile/android/branding/unofficial/content/jar.mn
new file mode 100644
index 000000000..e49cc4041
--- /dev/null
+++ b/mobile/android/branding/unofficial/content/jar.mn
@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+chrome.jar:
+% content branding %content/branding/ contentaccessible=yes
+ content/branding/about.png (about.png)
+ content/branding/favicon32.png (favicon32.png)
+ content/branding/favicon64.png (favicon64.png)
diff --git a/mobile/android/branding/unofficial/content/moz.build b/mobile/android/branding/unofficial/content/moz.build
new file mode 100644
index 000000000..eb4454d28
--- /dev/null
+++ b/mobile/android/branding/unofficial/content/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file
diff --git a/mobile/android/branding/unofficial/locales/en-US/brand.dtd b/mobile/android/branding/unofficial/locales/en-US/brand.dtd
new file mode 100644
index 000000000..3d998d15c
--- /dev/null
+++ b/mobile/android/branding/unofficial/locales/en-US/brand.dtd
@@ -0,0 +1,7 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY brandShortName "Fennec">
+<!ENTITY brandFullName "Mozilla Fennec">
+<!ENTITY vendorShortName "Mozilla"> \ No newline at end of file
diff --git a/mobile/android/branding/unofficial/locales/en-US/brand.properties b/mobile/android/branding/unofficial/locales/en-US/brand.properties
new file mode 100644
index 000000000..9cedd01af
--- /dev/null
+++ b/mobile/android/branding/unofficial/locales/en-US/brand.properties
@@ -0,0 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+brandShortName=Fennec
+brandFullName=Mozilla Fennec
diff --git a/mobile/android/branding/unofficial/locales/jar.mn b/mobile/android/branding/unofficial/locales/jar.mn
new file mode 100644
index 000000000..5a77695c9
--- /dev/null
+++ b/mobile/android/branding/unofficial/locales/jar.mn
@@ -0,0 +1,11 @@
+#filter substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+@AB_CD@.jar:
+% locale branding @AB_CD@ %locale/branding/
+# Nightly branding only exists in en-US
+ locale/branding/brand.dtd (en-US/brand.dtd)
+ locale/branding/brand.properties (en-US/brand.properties)
diff --git a/mobile/android/branding/unofficial/locales/moz.build b/mobile/android/branding/unofficial/locales/moz.build
new file mode 100644
index 000000000..eb4454d28
--- /dev/null
+++ b/mobile/android/branding/unofficial/locales/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file
diff --git a/mobile/android/branding/unofficial/moz.build b/mobile/android/branding/unofficial/moz.build
new file mode 100644
index 000000000..04084b1ac
--- /dev/null
+++ b/mobile/android/branding/unofficial/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIRS += ['content', 'locales']
diff --git a/mobile/android/branding/unofficial/res/drawable-hdpi/icon.png b/mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
new file mode 100644
index 000000000..786894f77
--- /dev/null
+++ b/mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
Binary files differ
diff --git a/mobile/android/branding/unofficial/res/drawable-hdpi/large_icon.png b/mobile/android/branding/unofficial/res/drawable-hdpi/large_icon.png
new file mode 100644
index 000000000..f59604226
--- /dev/null
+++ b/mobile/android/branding/unofficial/res/drawable-hdpi/large_icon.png
Binary files differ
diff --git a/mobile/android/branding/unofficial/res/drawable-hdpi/launcher_widget.png b/mobile/android/branding/unofficial/res/drawable-hdpi/launcher_widget.png
new file mode 100644
index 000000000..8e55b0c11
--- /dev/null
+++ b/mobile/android/branding/unofficial/res/drawable-hdpi/launcher_widget.png
Binary files differ
diff --git a/mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png b/mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
new file mode 100644
index 000000000..7ebffe3a5
--- /dev/null
+++ b/mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
Binary files differ
diff --git a/mobile/android/branding/unofficial/res/drawable-xhdpi/large_icon.png b/mobile/android/branding/unofficial/res/drawable-xhdpi/large_icon.png
new file mode 100644
index 000000000..f59604226
--- /dev/null
+++ b/mobile/android/branding/unofficial/res/drawable-xhdpi/large_icon.png
Binary files differ
diff --git a/mobile/android/branding/unofficial/res/drawable-xhdpi/launcher_widget.png b/mobile/android/branding/unofficial/res/drawable-xhdpi/launcher_widget.png
new file mode 100644
index 000000000..56f47446a
--- /dev/null
+++ b/mobile/android/branding/unofficial/res/drawable-xhdpi/launcher_widget.png
Binary files differ
diff --git a/mobile/android/branding/unofficial/res/drawable-xhdpi/widget_icon.png b/mobile/android/branding/unofficial/res/drawable-xhdpi/widget_icon.png
new file mode 100644
index 000000000..d5bcf9697
--- /dev/null
+++ b/mobile/android/branding/unofficial/res/drawable-xhdpi/widget_icon.png
Binary files differ
diff --git a/mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png b/mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
new file mode 100644
index 000000000..f59604226
--- /dev/null
+++ b/mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
Binary files differ
diff --git a/mobile/android/branding/unofficial/res/drawable-xxhdpi/large_icon.png b/mobile/android/branding/unofficial/res/drawable-xxhdpi/large_icon.png
new file mode 100644
index 000000000..f59604226
--- /dev/null
+++ b/mobile/android/branding/unofficial/res/drawable-xxhdpi/large_icon.png
Binary files differ
diff --git a/mobile/android/branding/unofficial/res/drawable-xxhdpi/launcher_widget.png b/mobile/android/branding/unofficial/res/drawable-xxhdpi/launcher_widget.png
new file mode 100644
index 000000000..eb88984db
--- /dev/null
+++ b/mobile/android/branding/unofficial/res/drawable-xxhdpi/launcher_widget.png
Binary files differ