diff options
| author | Baligh Uddin <baligh@google.com> | 2013-12-19 05:57:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-19 05:57:30 +0000 |
| commit | 0c0c0e4a267d41d66382c6d070cbea98f2407b47 (patch) | |
| tree | 1c79f3ec7ab815dc4d0810de01740465f0667209 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | dc9197eecd50b61d0752c70c48a5d09641c55287 (diff) | |
| parent | 48b5f4b17677c60f6a2ff75bcc50a56182371b07 (diff) | |
am 48b5f4b1: (-s ours) am 73a2208d: (-s ours) am b158819d: (-s ours) am 2e371ee1: (-s ours) am c5b19fd3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '48b5f4b17677c60f6a2ff75bcc50a56182371b07':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions