diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-20 20:12:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-20 20:12:55 +0000 |
| commit | 5038b92e6adae454feb6095092bdaff80ecf1db3 (patch) | |
| tree | a851e0d3e00737ab6e4da021ad8ede4e102c6c3f /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 5cdc7f045f8714f5a9fd00402de5b12d84bba99d (diff) | |
| parent | ddb33d7d879159471cee10bf471a6815e76ac376 (diff) | |
am ddb33d7d: (-s ours) am a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'ddb33d7d879159471cee10bf471a6815e76ac376':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions