Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo