diff options
| author | Baligh Uddin <baligh@google.com> | 2013-12-26 23:54:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-26 23:54:49 +0000 |
| commit | 00703316a8a53acb2c5a99adfcd3f2771f263b89 (patch) | |
| tree | de75fd77c509b76e1e4733628bd2b649eee5e393 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | f87f7b0196ecd9dc9a66271d2961961b2f4ef3f8 (diff) | |
| parent | bf29cbbc1df534dcf2f8553c70920b7cc056e76c (diff) | |
am bf29cbbc: (-s ours) am 28e21fb4: (-s ours) am 4c60be5b: (-s ours) am 7aa56efd: (-s ours) am 7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'bf29cbbc1df534dcf2f8553c70920b7cc056e76c':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions