am 40f2faad: Merge "Fix a calendar info query to use a constant instead of a string"

* commit '40f2faadc10f7b4b549dfd32c5bc1c7c2033ca48':
  Fix a calendar info query to use a constant instead of a string