diff options
author | Baligh Uddin <baligh@google.com> | 2013-12-11 22:00:51 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-11 22:00:51 +0000 |
commit | dd914cc253afcccd0513df90f22013d8ad01a18a (patch) | |
tree | 475e1410a34abbfd6520fb285ab2700eb2e2820c /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | ac7737fc99561344c19a267f7e8d1fe5e27d32a0 (diff) | |
parent | 5d819bef3f4bf97c87032cc403e859b1d0d6797a (diff) |
am 5d819bef: (-s ours) am 32aa8222: (-s ours) am 0a102150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '5d819bef3f4bf97c87032cc403e859b1d0d6797a':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions