diff options
author | Eric Fischer <enf@google.com> | 2011-02-10 13:56:36 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-10 13:56:36 -0800 |
commit | da4efd348810613225f7de7fb29e4c227465bd9b (patch) | |
tree | 6cbaccf4c21d249ce688e71a8c049761f004824d /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | e75d8a7c9e5971a58776e2440c2ef44143f4970f (diff) | |
parent | bdf587e8b9247fbf8e544f330cf0ec9efb1194db (diff) |
am bdf587e8: (-s ours) am c1c31433: (-s ours) am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit 'bdf587e8b9247fbf8e544f330cf0ec9efb1194db':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions