diff options
| author | Baligh Uddin <baligh@google.com> | 2014-03-06 18:44:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-06 18:44:45 +0000 |
| commit | c7a535c552f8853076ba104e7948f7c1d324d47a (patch) | |
| tree | 04143a796335f9a6a05d10839e380871b360634e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 03f0834a03ed8296f31341b6d7b530ea74bc0188 (diff) | |
| parent | d010cf12c796cf83c760df037916e5572ce55868 (diff) | |
am d010cf12: (-s ours) am 221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'd010cf12c796cf83c760df037916e5572ce55868':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions