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:
1a0d680
bbaf6a4
)
Merge "Further interruptiveness changes" into pi-dev am: fe1d9dc1af
author
Julia Reynolds
<juliacr@google.com>
Wed, 6 Jun 2018 14:07:19 +0000
(07:07 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 6 Jun 2018 14:07:19 +0000
(07:07 -0700)
am:
bbaf6a4a6f
Change-Id: Ic6ac2a1ad921250fc751a643cd1b5ad58f8166e0
1
2
core/java/android/app/Notification.java
patch
|
diff1
|
diff2
|
blob
|
history
services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/app/Notification.java
Simple merge
diff --cc
services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
Simple merge