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