Merge "Handle returning a result from automatic up navigation from another task." into jb-dev

                onCreateNavigateUpTaskStack(b);

                onPrepareNavigateUpTaskStack(b);

                b.startActivities();

                // We can't finishAffinity if we have a result.

                // Fall back and simply finish the current activity instead.

                if (mResultCode != RESULT_CANCELED || mResultData != null) {

                    // Tell the developer what's going on to avoid hair-pulling.

                    Log.i(TAG, "onNavigateUp only finishing topmost activity to return a result");

                    finish();

                } else {

                    finishAffinity();

                }

            } else {

                navigateUpTo(upIntent);

            }