Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 am: 9e4e794f09

Change-Id: Ibfec3437d07726fda09d4cf4a8976356965930d3

src/com/android/settings/notification/history/NotificationHistoryActivity.java

@@ -200,20 +200,6 @@ public class NotificationHistoryActivity extends Activity {
         super.onDestroy();
     }
 
-    @Override
-    public void onBackPressed() {
-        handleBackPressed();
-    }
-
-    private void handleBackPressed() {
-        if (getFragmentManager().getBackStackEntryCount() > 1) {
-            super.onBackPressed();
-        } else {
-            startActivity(new Intent(Settings.ACTION_NOTIFICATION_SETTINGS));
-            finish();
-        }
-    }
-
     private void bindSwitch() {
         if (mSwitchBar != null) {
             mSwitchBar.setSwitchBarText(R.string.notification_history_toggle,