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