Backed out changeset 050fbc311d98 (bug 1232632) for android build bustage

mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java

@@ -451,7 +451,6 @@ OnSharedPreferenceChangeListener
         return GeckoPreferenceFragment.class.getName().equals(fragmentName);
     }
 
-    @TargetApi(11)
     @Override
     public void onBuildHeaders(List<Header> target) {
         if (onIsMultiPane()) {
@@ -464,9 +463,6 @@ OnSharedPreferenceChangeListener
 
                 if (header.id == R.id.pref_header_advanced && !Restrictions.isAllowed(this, Restrictable.ADVANCED_SETTINGS)) {
                     iterator.remove();
-                } else if (header.id == R.id.pref_header_clear_private_data
-                           && !Restrictions.isAllowed(this, Restrictable.CLEAR_HISTORY)) {
-                    iterator.remove();
                 }
             }
 

mobile/android/base/resources/xml-v11/preference_headers.xml

@@ -45,8 +45,7 @@
     </header>
 
     <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
-        android:title="@string/pref_clear_private_data_now"
-        android:id="@+id/pref_header_clear_private_data">
+        android:title="@string/pref_clear_private_data_now">
         <extra android:name="resource"
             android:value="preferences_privacy_clear_tablet"/>
     </header>