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:
acb2a9a
fc04b1d
)
am 4368f19f: am 064c40c0: Merge "Wire up CATEGORY_ALARM and CATEGORY_EVENT." into...
author
John Spurlock
<jspurlock@google.com>
Wed, 23 Jul 2014 01:19:26 +0000
(
01:19
+0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 23 Jul 2014 01:19:26 +0000
(
01:19
+0000)
* commit '
4368f19f5011891268da673dee4636cf61f3cae7
':
Wire up CATEGORY_ALARM and CATEGORY_EVENT.
Trivial merge