am 80656fb7: am 62a99c0b: Merge "LayoutLib: Handle color state list in methods...
am 80656fb7: am 62a99c0b: Merge "LayoutLib: Handle color state list in methods returning an int." into honeycomb
* commit '80656fb7':
LayoutLib: Handle color state list in methods returning an int.