diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-02-07 10:22:32 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-07 10:22:32 -0800 |
| commit | 80656fb71e98aa5aa2f9d7f010f2db4dfc0c9ff5 (patch) | |
| tree | 1b9b34730084bcee5aa88d4cce0accc442e99fd1 /graphics/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | bb756a90902ade5cf619f5fa65ec5505dcdf431a (diff) | |
| parent | 62a99c0b3bca70262ab205a5688ff69cbbbaee78 (diff) | |
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.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions