diff options
| author | Scott Main <smain@google.com> | 2012-03-29 12:09:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-29 12:09:47 -0700 |
| commit | fd7f7025eea4afc41efd5efac532c44181e76a75 (patch) | |
| tree | b9a6b2a7f0bdad33992d2e6b1aa27cc5b283aa5a /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d6a10010272bb486a25418c0d45b59e3e6e2915e (diff) | |
| parent | af9a26b21262500c5f864bcd82bc14ee805fdaac (diff) | |
am af9a26b2: Merge "docs: replace the "Contribute" message with "Design"" into ics-mr1
* commit 'af9a26b21262500c5f864bcd82bc14ee805fdaac':
docs: replace the "Contribute" message with "Design"
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions