diff options
author | Baligh Uddin <baligh@google.com> | 2013-12-26 23:50:28 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-26 23:50:28 +0000 |
commit | 57d5cc8849d47ed22db2c33590a7bf073a63cf07 (patch) | |
tree | cdf5365dcb27ee831323c80daa80d6e0225b14a3 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | bf29cbbc1df534dcf2f8553c70920b7cc056e76c (diff) | |
parent | 5cf8dc8ea5b364802f9e986ddb7f4e21652145be (diff) |
am 5cf8dc8e: (-s ours) am ca7a1442: (-s ours) am a95f6e3a: (-s ours) am bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '5cf8dc8ea5b364802f9e986ddb7f4e21652145be':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions