OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 955ff80 f7043e2)
am f7043e28: am 015a95ff: am 6a299907: Merge "Zen: Use account name instead of calend...
authorJohn Spurlock <jspurlock@google.com>
Mon, 1 Jun 2015 15:45:05 +0000 (15:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:45:05 +0000 (15:45 +0000)
* commit 'f7043e284a8480df5cdbca26ff75354d2b243bb7':
  Zen: Use account name instead of calendar id in event conditions.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help