diff options
| author | Scott Main <smain@google.com> | 2012-03-27 10:10:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-27 10:10:39 -0700 |
| commit | adf3b51a57f1830c40cdc4091650c2a4db0a69c1 (patch) | |
| tree | 6842d52973c2c8e4df61dc57dd168703a2bb84ca /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8b75efd2886030db53eec6a005758c9f34b003dc (diff) | |
| parent | 3aba4df731388454a3f8aa842f44a62c1a41a5c2 (diff) | |
am 3aba4df7: am 0824035b: am af9a26b2: Merge "docs: replace the "Contribute" message with "Design"" into ics-mr1
* commit '3aba4df731388454a3f8aa842f44a62c1a41a5c2':
docs: replace the "Contribute" message with "Design"
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions