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.
tree: ea8394774dd2af9d10699c0198d5639d47f212a6
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE