OSDN Git Service

Merge \"Fixed an issue where the deleteintent of children wasn\'t sent\" into nyc-dev
authorSelim Cinek <cinek@google.com>
Tue, 21 Jun 2016 18:14:29 +0000 (18:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Jun 2016 18:14:29 +0000 (18:14 +0000)
commit60f1f01d664a63cbebbaa414cfce6be9de1e8de7
tree84f7c5aa1c2e07e5aa5057419c98af150b8dfaa4
parent3d72ca32bee905845dc41624510eb8051818599e
parent1e7d8d381768ddb8868ba50612a1e48d44bfce6f
Merge \"Fixed an issue where the deleteintent of children wasn\'t sent\" into nyc-dev
am: 1e7d8d3817

Change-Id: I68a4c2c3d3a56712ab8989649ca6cbbeb2712936
services/core/java/com/android/server/notification/NotificationManagerService.java