diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-02-24 17:24:07 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-24 17:24:07 -0800 |
| commit | b84c678a9c397d5b3c5141ddda304ceb71426c8d (patch) | |
| tree | a02d60c928a7fa72d10346cd23d60589224a097f /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b052ecaa7e6ce40cec43efe5353b4bb12079aa55 (diff) | |
| parent | db1acf52bb6e4b949bcef09f903d662aed9b8a3a (diff) | |
am db1acf52: (-s ours) am 1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread
* commit 'db1acf52bb6e4b949bcef09f903d662aed9b8a3a':
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