Merge commit '612ebb9257e2adf982ed846fa43251c3754361f7' into gingerbread-plus-aosp * commit '612ebb9257e2adf982ed846fa43251c3754361f7': Revert "Update the documentation for content provider security."
Merge commit '612ebb9257e2adf982ed846fa43251c3754361f7' into gingerbread-plus-aosp * commit '612ebb9257e2adf982ed846fa43251c3754361f7': Revert "Update the documentation for content provider security."