diff options
author | Baligh Uddin <baligh@google.com> | 2013-12-26 23:54:44 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-26 23:54:44 +0000 |
commit | f87f7b0196ecd9dc9a66271d2961961b2f4ef3f8 (patch) | |
tree | de75fd77c509b76e1e4733628bd2b649eee5e393 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | f38d305bfa0152e8cf6093eb681617f4845a4b76 (diff) | |
parent | 7aa47b52702d5be6b1644f4a6fe406e02c0cf5b8 (diff) |
am 7aa47b52: (-s ours) am c3e5b034: (-s ours) am ad141bd7: (-s ours) am dd6517c9: (-s ours) am ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '7aa47b52702d5be6b1644f4a6fe406e02c0cf5b8':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions