tree bebef3e8b8d9ef0842d6591508d78f58300dd5bb
parent aeb826e7f4d693dc9d3c9a389a78a9264708e5c5
parent abb3d697c872dbc29ce5cfa376369e724c7e362c
author Nick Kralevich <nnk@google.com> 1343690944 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343690944 -0700

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

* commit 'abb3d697c872dbc29ce5cfa376369e724c7e362c':
  Explicitly export content providers