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:
d8b866e
ae0aed9
)
Merge \"Snooze schedule rules that were canceled by alarms.\" into nyc-mr1-dev
author
Julia Reynolds
<juliacr@google.com>
Wed, 20 Jul 2016 20:45:13 +0000
(20:45 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 20 Jul 2016 20:45:13 +0000
(20:45 +0000)
am:
ae0aed951b
Change-Id: I18bd8e7528a6c24f350c97268b26fe91ef198290
1
2
core/java/android/service/notification/ZenModeConfig.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/service/notification/ZenModeConfig.java
Simple merge