diff options
author | Baligh Uddin <baligh@google.com> | 2014-05-22 03:11:11 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-22 03:11:11 +0000 |
commit | 48137740b8f0af0efad73c052256af14e1825944 (patch) | |
tree | bde4db766b585687234e96d027c8b0274b57a841 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 25fe41b8e0a0e7e80bcc533b5087d63767faa689 (diff) | |
parent | b9c1e5a82947e13a10b407a1d4f81967c9af99b4 (diff) |
am b9c1e5a8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'b9c1e5a82947e13a10b407a1d4f81967c9af99b4':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions