tree 1b9b34730084bcee5aa88d4cce0accc442e99fd1
parent bb756a90902ade5cf619f5fa65ec5505dcdf431a
parent 62a99c0b3bca70262ab205a5688ff69cbbbaee78
author Xavier Ducrohet <xav@android.com> 1297102952 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297102952 -0800

am 62a99c0b: Merge "LayoutLib: Handle color state list in methods returning an int." into honeycomb

* commit '62a99c0b3bca70262ab205a5688ff69cbbbaee78':
  LayoutLib: Handle color state list in methods returning an int.