Merge "Merge "Update docs for ColorStateList to include alpha" into nyc-dev...
Merge "Merge "Update docs for ColorStateList to include alpha" into nyc-dev am: 5bcf7650 am: f10697e1" into nyc-mr1-dev-plus-aosp
am: 855be028
* commit '855be028':
Change-Id: Ic5b51a53b4734b9e3632e978ef4d1b20408a6d8a