diff options
| author | Eric Fischer <enf@google.com> | 2011-12-09 14:58:10 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-09 14:58:10 -0800 |
| commit | 049bc558b3c0dc437dbc67d827318135a772850d (patch) | |
| tree | 6afa66dae5d2124106f824f450c690bb058ba642 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 57c82bf0bc369b7313c4a9ddec4ae933d025e91b (diff) | |
| parent | 8430094cd9ecfcb932014ed5ae2d3db095bc7382 (diff) | |
am 8430094c: (-s ours) am ab6b816a: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '8430094cd9ecfcb932014ed5ae2d3db095bc7382':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions