diff options
| author | Baligh Uddin <baligh@google.com> | 2013-11-05 14:23:00 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-05 14:23:00 -0800 |
| commit | 133e16a6cec38ced91b212d710f1bb8395a79e31 (patch) | |
| tree | e6d1d2d4af2209734e5c4dda9b118978e5166798 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8ffebbd193ade88bb790b04e4380175b45a188e9 (diff) | |
| parent | 124f38f1179843f50db6287570eb09db633994f0 (diff) | |
am 124f38f1: (-s ours) am 7f4cf0da: (-s ours) am 6a2ab888: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '124f38f1179843f50db6287570eb09db633994f0':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions