diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-22 14:45:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-22 14:45:15 +0000 |
| commit | 553d3d6f239c2126952f0074ba8b1f78588b03cb (patch) | |
| tree | 718b77aeeafad02c7a85b4fb1e6b4509a61f809b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 54137069630259269555e017f472417c0fa99c47 (diff) | |
| parent | 6722aed82941a9af573d67550dec0db50dffa1d3 (diff) | |
am 6722aed8: (-s ours) am 1ac9628c: (-s ours) am 8d5ed661: (-s ours) am 920e8be6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '6722aed82941a9af573d67550dec0db50dffa1d3':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions