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