diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-22 16:38:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-22 16:38:55 +0000 |
| commit | 176df28256f2657f933235d99cf3247081b02f42 (patch) | |
| tree | ea3a51a5eb52af1faf0e316af511f2b4a868e12d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6722aed82941a9af573d67550dec0db50dffa1d3 (diff) | |
| parent | 1e06d4c64b6549a73df9d308ae82d7080fd51f37 (diff) | |
am 1e06d4c6: (-s ours) am 5c080bd2: (-s ours) am c41e3191: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '1e06d4c64b6549a73df9d308ae82d7080fd51f37':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions