OSDN Git Service

Merge \"Merge \\"Remove redundant setPendingIntentWhitelistDuration() calls.\\" into...
authorFelipe Leme <felipeal@google.com>
Tue, 28 Jun 2016 20:53:43 +0000 (20:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Jun 2016 20:53:43 +0000 (20:53 +0000)
commit62e46e8899d79ffb058f9e47afcabc73f9426ebf
tree73e7617f040b164fbe5e29a9e25decf20a4281e0
parentc3575b2149c00d8c1e268d913864b36c7e2795df
parentb1400b142e01ea95bcfde24efbc9d564ce9146b6
Merge \"Merge \\"Remove redundant setPendingIntentWhitelistDuration() calls.\\" into nyc-dev am: c1374208e3\" into nyc-mr1-dev
am: b1400b142e

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