diff options
| author | Andreas Huber <andih@google.com> | 2010-09-21 15:25:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 15:25:42 -0700 |
| commit | 55e024a925b061193432339a003b141103969250 (patch) | |
| tree | f63bb563b47cd15a08a1bb13b324dbce4b18af86 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 41fd0a0fa98adf06cad78d168f3e5fe4ab272ea4 (diff) | |
| parent | 0b2affe8f05f887fcb6ae6314e2a0e586dabe9e1 (diff) | |
am 0b2affe8: am 87d208f7: Merge "This log message is codec specific." into gingerbread
Merge commit '0b2affe8f05f887fcb6ae6314e2a0e586dabe9e1'
* commit '0b2affe8f05f887fcb6ae6314e2a0e586dabe9e1':
This log message is codec specific.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions