diff options
author | Xavier Ducrohet <xav@android.com> | 2011-02-24 20:32:31 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-24 20:32:31 -0800 |
commit | f09078429361ec19f431641b44be37c0161dc209 (patch) | |
tree | e4807b14fa45433586e841c71e95d3901fe5c2b4 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 95e384e8d45afeeafe47f54258522b1b67b01dca (diff) | |
parent | b84c678a9c397d5b3c5141ddda304ceb71426c8d (diff) |
am b84c678a: (-s ours) am db1acf52: (-s ours) am 1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread
* commit 'b84c678a9c397d5b3c5141ddda304ceb71426c8d':
LayoutLib: Adapt the HC layoutlib to GB. do not merge.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions