diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-14 16:28:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-14 16:28:17 +0000 |
| commit | 703be9f6ffb962a9b11f0755cae41f7818989c81 (patch) | |
| tree | 4c4d55001d2021c0945c693e8d105d7d91a2a905 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 5571a986f0a2939248aefc584248d08732c761e4 (diff) | |
| parent | bd16cb67a4058d6faa8123f30fe657c0607dd05d (diff) | |
am bd16cb67: (-s ours) am b48de758: (-s ours) am d64aa493: (-s ours) am c021aaaf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'bd16cb67a4058d6faa8123f30fe657c0607dd05d':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions