diff options
author | Baligh Uddin <baligh@google.com> | 2014-07-06 18:33:12 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-06 18:33:12 +0000 |
commit | 476a40e33243c7c86859aa7fbadb8f24c0c32d3b (patch) | |
tree | 52ce1845696e788825e05127a459d7370e0efdfe /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 2353a8fc5da7402e7bdd0b6eb54edb583fe27f8f (diff) | |
parent | f643d52941be004e14b7edfe3035996475f95028 (diff) |
am f643d529: (-s ours) am b4600e79: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'f643d52941be004e14b7edfe3035996475f95028':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions