Merge "Accept the calendar name in addition to the owner as a calendar...
Merge "Accept the calendar name in addition to the owner as a calendar filter." into nyc-dev am: 54a6394c
am: ccd8b64b
* commit 'ccd8b64b':
Accept the calendar name in addition to the owner as a calendar filter.
Change-Id: Icbb2bd0b0f2f175e7120b1e2868efe6863defde7