diff options
| author | Andreas Huber <andih@google.com> | 2010-10-15 08:33:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 08:33:23 -0700 |
| commit | a4a2a3aaef730dbab020f7ece09149b05a399000 (patch) | |
| tree | b0761447c181e0c07d3ee7f80996c24e1d4bdd2d /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c182a57897fbb505b7043cdd03a7f4eb41ed67e2 (diff) | |
| parent | 27c7fb1a861776b4fdc2632697e4e25eee83617f (diff) | |
am 27c7fb1a: am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread
Merge commit '27c7fb1a861776b4fdc2632697e4e25eee83617f'
* commit '27c7fb1a861776b4fdc2632697e4e25eee83617f':
Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions