diff options
| author | Baligh Uddin <baligh@google.com> | 2014-08-15 22:20:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-15 22:20:13 +0000 |
| commit | 062feaf39594df4b09fc6e1b005bb72b334f3c79 (patch) | |
| tree | 94f6d08290ab11bcf9cb897270fd3577fd9cdaf6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b2df3e40d5bb08295ebb9ee72bd601d88545cc2c (diff) | |
| parent | 2f53238fe440d8615d8874e2fb23535c29b47aec (diff) | |
am 2f53238f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '2f53238fe440d8615d8874e2fb23535c29b47aec':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions