diff options
| author | Eric Fischer <enf@google.com> | 2011-10-31 12:26:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-31 12:26:51 +0000 |
| commit | c86b8730e8c0ee930af5151cc47e6822408ac5ed (patch) | |
| tree | 9fde0205366e00d3fb81b9be748393c1aa481c5f /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0c91855c0beed26f49947a72157aa5fecf6bcf6b (diff) | |
| parent | 94e08f40936b6a280f404e8b67cb5ef900747258 (diff) | |
am 94e08f40: (-s ours) am 2cc1c5d0: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '94e08f40936b6a280f404e8b67cb5ef900747258':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions