tree 103fe345bec704c83538bc7cd251fac08d4b788b
parent 78af4a0faccb012c168e54b5be78459b0e26d67e
parent 64b17f580048a455df330abfd9a49ea5e8b6938a
author Dianne Hackborn <hackbod@google.com> 1255049649 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255049649 -0700

Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Calendar into eclair-mr2-plus-aosp