diff options
author | Xavier Ducrohet <xav@android.com> | 2011-05-18 17:43:27 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-18 17:43:27 -0700 |
commit | 582841e734bc85b247df64ac85b6ee09f7375f44 (patch) | |
tree | 5671924e38ad28e01dfeb60a7849e7ee57eb959d /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 380244e9d6c8016bc1a04691a3af0fd999ddf6b0 (diff) | |
parent | b18e700cb9c1d7090904449fc6878b8eae1d4693 (diff) |
am b18e700c: am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
* commit 'b18e700cb9c1d7090904449fc6878b8eae1d4693':
LayoutLib: support the new baseline/margin query API.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions