From 69f95dd1196c82fa638b76883687bdec491bdc88 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@gmail.com>
Date: Tue, 20 Oct 2015 12:43:33 +0200
Subject: [PATCH] Bug 1204917 - Remove Nightly flag for back button in tabs
 tray. r=margaret

---
 mobile/android/base/tabs/TabsPanel.java | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/mobile/android/base/tabs/TabsPanel.java b/mobile/android/base/tabs/TabsPanel.java
index 14efd96c5a5..127fa7dc6dc 100644
--- a/mobile/android/base/tabs/TabsPanel.java
+++ b/mobile/android/base/tabs/TabsPanel.java
@@ -164,16 +164,14 @@ public class TabsPanel extends LinearLayout
             }
         });
 
-        if (AppConstants.NIGHTLY_BUILD || HardwareUtils.isTablet()) {
-            ViewStub backButtonStub = (ViewStub) findViewById(R.id.nav_back_stub);
-            mNavBackButton = (ImageButton) backButtonStub.inflate( );
-            mNavBackButton.setOnClickListener(new Button.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    mActivity.onBackPressed();
-                }
-            });
-        }
+        ViewStub backButtonStub = (ViewStub) findViewById(R.id.nav_back_stub);
+        mNavBackButton = (ImageButton) backButtonStub.inflate( );
+        mNavBackButton.setOnClickListener(new Button.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mActivity.onBackPressed();
+            }
+        });
     }
 
     public void showMenu() {