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:
7135e60
5743657
)
am 57436577: am f1b897e8: am e648c5f1: Merge "Zen: Add warning text if total silence...
author
John Spurlock
<jspurlock@google.com>
Mon, 1 Jun 2015 15:46:49 +0000
(15:46 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 1 Jun 2015 15:46:49 +0000
(15:46 +0000)
* commit '
57436577e2771cd4ff81c88d93362325ecd3a8c7
':
Zen: Add warning text if total silence will eat the next alarm.
Trivial merge