diff options
| author | Chet Haase <chet@google.com> | 2010-09-15 21:16:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 21:16:35 -0700 |
| commit | 7ddff990ac2626d0e174ab57ff7bdc422e1d0fbf (patch) | |
| tree | 28bea322cc8c6510206c154770e2a7f7ac960ad7 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7642c82c291051919aad87c797e2dc1d77ed55e1 (diff) | |
| parent | 07980dc8a723c6a26003c1ebe74372a2b4fa6777 (diff) | |
am 07980dc8: Merge "Adding new assets for designers" into gingerbread
Merge commit '07980dc8a723c6a26003c1ebe74372a2b4fa6777' into gingerbread-plus-aosp
* commit '07980dc8a723c6a26003c1ebe74372a2b4fa6777':
Adding new assets for designers
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions