Merge "Use finishAffinity for automatic up navigation" into jb-dev

Author: adamp

core/java/android/app/Activity.java

@@ -2714,7 +2714,7 @@ public boolean onNavigateUp() {
                 onCreateNavigateUpTaskStack(b);
                 onPrepareNavigateUpTaskStack(b);
                 b.startActivities();
-                finish();
+                finishAffinity();
             } else {
                 navigateUpTo(upIntent);
             }