Merge commit 'ff0dc82c1cfe780e6f4c87d1d34de6dc3b741a2d' into eclair-plus-aosp * commit 'ff0dc82c1cfe780e6f4c87d1d34de6dc3b741a2d': Fix content provider
Merge commit 'ff0dc82c1cfe780e6f4c87d1d34de6dc3b741a2d' into eclair-plus-aosp * commit 'ff0dc82c1cfe780e6f4c87d1d34de6dc3b741a2d': Fix content provider