Merge "COMMENT-ONLY change to clarify Camera documentation." into froyo