diff options
| author | Baligh Uddin <baligh@google.com> | 2013-10-28 12:44:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-28 12:44:03 -0700 |
| commit | 6639f734716a34c7abcabcfa686f67da08d8e068 (patch) | |
| tree | 78469c05351dcc4c0f3e674e05198bb5030f60f9 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | c7d7e071970e70c0bb8039949b0c4d097ebaa5cb (diff) | |
| parent | 51ef6f688a0aaf7f0ee201096bac58381bcb9f20 (diff) | |
am 51ef6f68: (-s ours) am 170735d4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '51ef6f688a0aaf7f0ee201096bac58381bcb9f20':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions