Merge "Fix a bug with updating extras in a PendingIntent with an intent stack" into jb-dev

Author: adamp

services/java/com/android/server/am/ActivityManagerService.java

@@ -4376,7 +4376,8 @@ IIntentSender getIntentSenderLocked(int type,
             if (!cancelCurrent) {
                 if (updateCurrent) {
                     if (rec.key.requestIntent != null) {
-                        rec.key.requestIntent.replaceExtras(intents != null ? intents[0] : null);
+                        rec.key.requestIntent.replaceExtras(intents != null ?
+                                intents[intents.length - 1] : null);
                     }
                     if (intents != null) {
                         intents[intents.length-1] = rec.key.requestIntent;