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
am: 325e71b9
* commit '325e71b9':
Accept the calendar name in addition to the owner as a calendar filter.
Change-Id: I90d37a0e2e873734e50306a23d20e1cea73986bb