diff options
author | Baligh Uddin <baligh@google.com> | 2014-07-06 18:08:28 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-06 18:08:28 +0000 |
commit | fd5e46171db33fc2f5dcb6fbfbb6b19e36e9b485 (patch) | |
tree | d6b165581f1f6fcf678335c6c2d1ba5ef2fe5fdb /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 026d5d21e1de6ba1a085059bb9a6c959690dc994 (diff) | |
parent | f2e29071079ab67d6ed66852f6a6f5d4f1ee8753 (diff) |
am f2e29071: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'f2e29071079ab67d6ed66852f6a6f5d4f1ee8753':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions