diff options
author | Baligh Uddin <baligh@google.com> | 2014-07-06 18:39:24 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-06 18:39:24 +0000 |
commit | 9c9223d91eb57ba7f45532e551861696c55883ec (patch) | |
tree | 52ce1845696e788825e05127a459d7370e0efdfe /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 494d4005d5bb1e23fceefa766dca95c3acfa610f (diff) | |
parent | 2ea222e6615cef6977e40b0dbb7b58c2313e6976 (diff) |
am 2ea222e6: (-s ours) am 93360f02: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '2ea222e6615cef6977e40b0dbb7b58c2313e6976':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions