diff options
| author | Baligh Uddin <baligh@google.com> | 2015-11-05 19:50:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-05 19:50:16 +0000 |
| commit | 22b41d07ff7198f9c2bee4254c2f02a15128bd51 (patch) | |
| tree | 58c89436dda888768189aa449eed2abf99f15cb1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 010d1d1e15eb0cad401e15bec4f9f0dac72fb56e (diff) | |
| parent | c138df954f4ace40e722b9acbb2359d566da2147 (diff) | |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: c138df954f -s ours
* commit 'c138df954f4ace40e722b9acbb2359d566da2147':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions