OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
033c29a
94bd234
)
Merge "Merge "Optionally append managed service approvals" into oc-mr1-dev am: d87e79...
author
Julia Reynolds
<juliacr@google.com>
Tue, 15 Aug 2017 21:59:50 +0000
(21:59 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 15 Aug 2017 21:59:50 +0000
(21:59 +0000)
am:
94bd234479
Change-Id: I5d8a7dafb0b3938324df494ee49c644a47ef6d96
1
2
services/core/java/com/android/server/notification/NotificationManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/notification/NotificationManagerService.java
Simple merge