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