diff options
| author | Eric Fischer <enf@google.com> | 2010-09-24 11:25:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-24 11:25:47 -0700 |
| commit | 369b43a935d08f1d9991a80a5859c65c394e9a02 (patch) | |
| tree | 082159c69563b94294a3bb682b6291051a4a3a9b /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ed63f505ea8a8d89afb51cf4d0b21cad790ec469 (diff) | |
| parent | f2af2d924df3d444c9a1bcac9f30e0d05ea5086d (diff) | |
am f2af2d92: (-s ours) am 4318ab05: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit 'f2af2d924df3d444c9a1bcac9f30e0d05ea5086d'
* commit 'f2af2d924df3d444c9a1bcac9f30e0d05ea5086d':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions