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:
2a9f87c
ad2399f
)
am ad2399f3: Merge "Zen: Implement calendar event system condition provider." into...
author
John Spurlock
<jspurlock@google.com>
Tue, 5 May 2015 00:56:53 +0000
(
00:56
+0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 5 May 2015 00:56:53 +0000
(
00:56
+0000)
* commit '
ad2399f3be4861d0f5acf072460d98fafc951c57
':
Zen: Implement calendar event system condition provider.
Trivial merge