diff options
| author | Baligh Uddin <baligh@google.com> | 2013-10-28 12:43:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-28 12:43:57 -0700 |
| commit | 04cebc99c29f681df897260c1d8091f6df64bd86 (patch) | |
| tree | 78469c05351dcc4c0f3e674e05198bb5030f60f9 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 16e85886649f7dfa165452f984e15b10e93c1f4f (diff) | |
| parent | 53ffdcc0aac3a61e3b28f264127f5c2ca273998a (diff) | |
am 53ffdcc0: (-s ours) am 9b16d131: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '53ffdcc0aac3a61e3b28f264127f5c2ca273998a':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions