diff options
| author | Baligh Uddin <baligh@google.com> | 2014-04-23 02:08:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-23 02:08:13 +0000 |
| commit | c1c6de3f918d4feb7c60534fe2fc76566a7aa215 (patch) | |
| tree | c93fd0ca340ee1bbce39493983d4c2af4d2cc0a5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6c8e9296c35ec88b5093d4f5553252ee0f244141 (diff) | |
| parent | c2c527a6f4b3629ea271ef5444292a02e2d9a17e (diff) | |
am c2c527a6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'c2c527a6f4b3629ea271ef5444292a02e2d9a17e':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions