diff options
| author | Mindy Pereira <mindyp@google.com> | 2010-09-26 18:45:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-26 18:45:48 -0700 |
| commit | b611b7c8d5d6ebeae1b2fed65eb25f5aa684763a (patch) | |
| tree | 800f5a1d1fb7681c43ecec78617fed1e30c80f99 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1f0d3963d65d092d2a0ed6e38b4223243290f183 (diff) | |
| parent | 560ba6e1a9dbd8a57fdee2040185981162ed09d6 (diff) | |
am 560ba6e1: (-s ours) am 08c09b0f: Merge "DO NOT MERGE. Only 1 edge glow should be growing at a time." into gingerbread
Merge commit '560ba6e1a9dbd8a57fdee2040185981162ed09d6'
* commit '560ba6e1a9dbd8a57fdee2040185981162ed09d6':
DO NOT MERGE. Only 1 edge glow should be growing at a time.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions