Merge commit '234e42df5fac958ed9f15aae6005dd72e4bdf08a' into gingerbread-plus-aosp * commit '234e42df5fac958ed9f15aae6005dd72e4bdf08a': DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.*
Merge commit '234e42df5fac958ed9f15aae6005dd72e4bdf08a' into gingerbread-plus-aosp * commit '234e42df5fac958ed9f15aae6005dd72e4bdf08a': DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.*