tree d9884233cdfcd815560f23652bceca1fac42f54a
parent b0f1cfffd9b201335560c15ffbdcfe12225bac8c
parent d96a7403cda1a873e640b6e6395ddab4c2f9b9f9
author Xavier Ducrohet <xav@android.com> 1297102728 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1297102728 -0800

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