diff options
| author | Baligh Uddin <baligh@google.com> | 2014-09-29 20:48:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-29 20:48:22 +0000 |
| commit | e6012bb9200993a71734e12f82d9a351958f821d (patch) | |
| tree | f3f90285d503a02b3f347f0c461738020c033152 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0bea72864e1129ef559744ab00e74b6215ef246c (diff) | |
| parent | b09aabfd5f40f924e46d7ef635ba46e2a85dde20 (diff) | |
am b09aabfd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'b09aabfd5f40f924e46d7ef635ba46e2a85dde20':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions