diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-29 16:38:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 16:38:57 +0000 |
| commit | e5f2866b9a07a3eadc9ee69811d4da4a32f5c199 (patch) | |
| tree | eba65393c698200b43bcff16f79d85faa1f055d7 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 4c55639a780caa3e0a3594795ab408c5a8618ff2 (diff) | |
| parent | d1675d8374679b464bd4cf0115e180b590514548 (diff) | |
am d1675d83: (-s ours) am f075a764: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'd1675d8374679b464bd4cf0115e180b590514548':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions