resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp

                    // being started, which means not bringing it to the front

                    // if the caller is not itself in the front.

                    ActivityRecord curTop = topRunningNonDelayedActivityLocked(notTop);

                    if (curTop.task != taskTop.task) {

                    if (curTop != null && curTop.task != taskTop.task) {

                        r.intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);

                        boolean callerAtFront = sourceRecord == null

                                || curTop.task == sourceRecord.task;