am 47a5cb12: am acd01ff0: Merge "Keep deleteIntent when copying Notification attributes"

* commit '47a5cb122ab495e8420c46d8f324bddcd38920af':
  Keep deleteIntent when copying Notification attributes
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 9e8a793..8dce59a 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -1736,6 +1736,7 @@
         builder.setSound(this.sound, this.audioStreamType);
         builder.setDefaults(this.defaults);
         builder.setVibrate(this.vibrate);
+        builder.setDeleteIntent(this.deleteIntent);
 
         // now apply the latestEventInfo fields
         if (contentTitle != null) {