diff options
| author | Eric Fischer <enf@google.com> | 2011-11-03 00:43:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-03 00:43:11 +0000 |
| commit | 30cddfe5e1e80059b87d3de72a8a6adfeb6f37fd (patch) | |
| tree | 7bea8235c7ec31e480a630737688e764cd00019f /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ceac0ecd1202aa736d7eed09ab4f84dd4f2ae1ca (diff) | |
| parent | c37f98eab3d6e63f71b1600ea0e4355c6503384b (diff) | |
am c37f98ea: (-s ours) am 8c49b81b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit 'c37f98eab3d6e63f71b1600ea0e4355c6503384b':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions