am 0bcb5d90: Merge "Explicitly export content providers" into jb-mr1-dev

* commit '0bcb5d904455c930bd2d7b68a477da2fe43dbcea':
  Explicitly export content providers