diff options
| author | Eric Fischer <enf@google.com> | 2011-02-24 11:24:39 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-24 11:24:39 -0800 |
| commit | 261f33c12d012fbc1f2fdd3dc8c21933c0798a1b (patch) | |
| tree | 9e34f244d5b88efddfaf5005514265d82bab8e0b /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5bf4bb97e09521bceb3e9a91ee9b8662e22dddab (diff) | |
| parent | 86409c8cb789cd7f672ee6de43e6bf1a337847db (diff) | |
am 86409c8c: (-s ours) am 1c38872f: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '86409c8cb789cd7f672ee6de43e6bf1a337847db':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions