Merge commit 'b350bec514eb9fee473e4ef62680c53e992dc49b' into gingerbread-plus-aosp * commit 'b350bec514eb9fee473e4ef62680c53e992dc49b': Minor changes to ContentProvider javadoc to improve consistency.