OSDN Git Service

Merge "Further interruptiveness changes" into pi-dev am: fe1d9dc1af
authorJulia Reynolds <juliacr@google.com>
Wed, 6 Jun 2018 14:07:19 +0000 (07:07 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Jun 2018 14:07:19 +0000 (07:07 -0700)
commit19b51f4fe3c73648b265550981d0462e5e37d885
treefd892e9f1a4509af30cf54d67b27c120494652d6
parent1a0d68003d3f07b961a83ad53a9266020ac20a6d
parentbbaf6a4a6f40d9dc8cc5f5a0fad69ec138da1368
Merge "Further interruptiveness changes" into pi-dev am: fe1d9dc1af
am: bbaf6a4a6f

Change-Id: Ic6ac2a1ad921250fc751a643cd1b5ad58f8166e0
core/java/android/app/Notification.java
services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java