diff options
author | Baligh Uddin <baligh@google.com> | 2013-11-05 13:27:11 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-05 13:27:11 -0800 |
commit | 576e780b8e9f135d85e83e09cbecb97492903db8 (patch) | |
tree | 806c1d62abf844bf3758212737dfa300d193b335 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 124f38f1179843f50db6287570eb09db633994f0 (diff) | |
parent | 79cfdb20be13e424089849a92c49516bfe785c90 (diff) |
am 79cfdb20: (-s ours) am b8ea1228: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '79cfdb20be13e424089849a92c49516bfe785c90':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions