diff options
author | Baligh Uddin <baligh@google.com> | 2013-12-26 15:34:18 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-26 15:34:18 -0800 |
commit | 4c60be5b135dd13556e947784f20f792c1f9d568 (patch) | |
tree | 00305c6c9559fb47f34dc37dfa3043c6095ed06c /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | ad141bd7e267c74daf33416412f9aab30e9751fa (diff) | |
parent | 7aa56efd7399b0628bde655c535fac6407eaade9 (diff) |
am 7aa56efd: (-s ours) am 7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '7aa56efd7399b0628bde655c535fac6407eaade9':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions