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