diff options
| author | Baligh Uddin <baligh@google.com> | 2013-07-01 20:35:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-01 20:35:20 -0700 |
| commit | 87a345e993eeee78501038fc55db223c39aba56d (patch) | |
| tree | f61ca90ab92d27a5d8c97b7ce7ee4bbbb7f7dcf8 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 05373e9daf542d6d3eb91146f1b5dd513d9b9577 (diff) | |
| parent | 22b41b0c0909c89031d165f7bed3d2016f930033 (diff) | |
am 22b41b0c: (-s ours) am 178807d5: am d6696b7c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '22b41b0c0909c89031d165f7bed3d2016f930033':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions