am d232e636: am 0f1a3972: Merge "Stash modulation alpha until ColorStateList...
am d232e636: am 0f1a3972: Merge "Stash modulation alpha until ColorStateList has resolved base color" into mnc-dev
* commit 'd232e636':
Stash modulation alpha until ColorStateList has resolved base color