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

* commit 'abb3d697c872dbc29ce5cfa376369e724c7e362c':
  Explicitly export content providers