diff options
| author | Baligh Uddin <baligh@google.com> | 2013-11-01 07:40:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-01 07:40:42 -0700 |
| commit | 5b76be492bcc7d0c9cc387bf3e16f29ced5ec2b2 (patch) | |
| tree | d41472385ba4866350f0aa8e8f78c0ef6ac1f802 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1af0938e2f28bf6388a3e01bb7503cea02f47885 (diff) | |
| parent | c08ce101e0fc093d1e2e97359dda501cf37d4270 (diff) | |
am c08ce101: (-s ours) am 50bdac61: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c08ce101e0fc093d1e2e97359dda501cf37d4270':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions