OSDN Git Service

Merge \"Mark app pending intents in notification extras\" into nyc-dev
authorSvet Ganov <svetoslavganov@google.com>
Tue, 28 Jun 2016 00:46:55 +0000 (00:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Jun 2016 00:46:55 +0000 (00:46 +0000)
commit7878e736f7d3e99829453684c30f4b673e71c1fd
tree43d1c696b82f66a2c44125035f33f59cfd825e85
parent91df8559c0d338234b9ee6140ddb2d49a0327e04
parentb2cd9c95bf5fdfb8a1ff85c0f8f9c66738dca463
Merge \"Mark app pending intents in notification extras\" into nyc-dev
am: b2cd9c95bf

Change-Id: Idb515255f224c23d60a513713d9e4f93decd7a9c
core/java/android/app/Notification.java
services/core/java/com/android/server/notification/NotificationManagerService.java