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:
729c31c
fd0b15c
)
Merge "Mock out usageStats in NotificationManagerServiceTests" into oc-dev
author
Geoffrey Pitsch
<gpitsch@google.com>
Fri, 2 Jun 2017 14:50:54 +0000
(14:50 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 2 Jun 2017 14:50:54 +0000
(14:50 +0000)
am:
fd0b15c196
Change-Id: I56ff2491ee5fd1d72f215e41a4d6ee2ee535ab8a
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