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