our fork of Calendar

Change-Id: I57448b46a2fa604f5c9b4c4831969efe22ff72be
Merge branch 'kitkat' into kk-ssh