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