diff options
| author | Baligh Uddin <baligh@google.com> | 2013-11-13 13:11:50 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-13 13:11:50 -0800 |
| commit | d0e2b18f55723ec2b045a28ad16b8edc07d27ad8 (patch) | |
| tree | 80f2e08a1bed79982af02a1fd13a3dd176cccc22 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 87b84ca6fc5070f2fbbb5f6d94863680b33d188b (diff) | |
| parent | 4a0e3b9ac5cb9006a3efe951fcd7f7427d4726cc (diff) | |
am 4a0e3b9a: (-s ours) am 5cc3ddf1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '4a0e3b9ac5cb9006a3efe951fcd7f7427d4726cc':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions