diff options
author | Baligh Uddin <baligh@google.com> | 2014-03-20 18:37:14 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 18:37:14 +0000 |
commit | 826f3647a4a44ffcf154c63fe204a7787b96a657 (patch) | |
tree | 70bfe40ac7772e27bd28b3d86fa6603243d70d25 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 5a510a2c3e0ec5f2e60577c7a57e60c2101ee354 (diff) | |
parent | d16505da8676b54dd354da278b1888f28257028b (diff) |
am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'd16505da8676b54dd354da278b1888f28257028b':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions