diff options
| author | Leon Scroggins <scroggo@google.com> | 2010-10-12 11:23:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-12 11:23:12 -0700 |
| commit | 00c50b2e49dbb3537a3ee553dc79d6e34cd00065 (patch) | |
| tree | 12c2cfb365b55c8e737892790cfa2634cbc13c1c /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4711d21a55d9ff6f234d3b06ff2d07dca19238fc (diff) | |
| parent | f348502c70ae2f3c90bf75d8c4b4402d5e8e4d59 (diff) | |
am f348502c: Merge "Allow TextView to do its thing." into gingerbread
Merge commit 'f348502c70ae2f3c90bf75d8c4b4402d5e8e4d59' into gingerbread-plus-aosp
* commit 'f348502c70ae2f3c90bf75d8c4b4402d5e8e4d59':
Allow TextView to do its thing.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions