diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-03 16:51:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-03 16:51:37 +0000 |
| commit | c3ad37403078e45dea96dfc273859082d749c799 (patch) | |
| tree | 7a364f8702f1dff74290266313cf9c59985fc35d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1055dbe46927b1dfab84a08550f1fa3a09bf84cd (diff) | |
| parent | d36380cc168bb2a7ed8827c7a89f78c9dcdb62b8 (diff) | |
am d36380cc: (-s ours) am 7e1c227e: (-s ours) am 91ddd4ad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'd36380cc168bb2a7ed8827c7a89f78c9dcdb62b8':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions