Merge "AOSP/Calendar - Minimal calendar app."
am: a4438e61ac

Change-Id: I3a8d08d1a8e3d9ec561fb4d8d35480584d2f7cb3