OSDN Git Service

resolve merge conflicts
authorBeverly <beverlyt@google.com>
Wed, 20 Jun 2018 13:25:51 +0000 (09:25 -0400)
committerBeverly <beverlyt@google.com>
Wed, 20 Jun 2018 13:26:22 +0000 (09:26 -0400)
commit1382d8d50eecf88e687f0d32db1b43648665c817
tree3af543dbc6ca6795f0dc0d4fe179d2c31b56b773
parent234a906ee11d4bc7dd1871d4a33128eff17cd892
parentd9b0bdcbc41e9e57a2fea5424a580c52272852cd
resolve merge conflicts

resolve merge conflicts of d9b0bdcbc41e9e57a2fea5424a580c52272852cd
to stage-aosp-master

Bug: none
Test: n/a
Change-Id: I97a0b4dd0736561e5575b1344f37a25847e4703e
services/core/java/com/android/server/notification/NotificationManagerService.java