Merge commit 'f52e9f703305a03e76f59ad41094c5bc8636d31c' into eclair-plus-aosp * commit 'f52e9f703305a03e76f59ad41094c5bc8636d31c': Revert "Fix content provider"
Merge commit 'f52e9f703305a03e76f59ad41094c5bc8636d31c' into eclair-plus-aosp * commit 'f52e9f703305a03e76f59ad41094c5bc8636d31c': Revert "Fix content provider"