Merge commit 'e1b4437dba7c33566af55d4e5d27d35729678684' into eclair * commit 'e1b4437dba7c33566af55d4e5d27d35729678684': Revert "Fix content provider"
Merge commit 'e1b4437dba7c33566af55d4e5d27d35729678684' into eclair * commit 'e1b4437dba7c33566af55d4e5d27d35729678684': Revert "Fix content provider"