am 7d9db612: Merge change 25885 into eclair

Merge commit '7d9db612bdecad3d6667858ac296f5ede27aabfa' into eclair-plus-aosp

* commit '7d9db612bdecad3d6667858ac296f5ede27aabfa':
  handle calendars with an access level of "root"