diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-20 15:12:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-20 15:12:57 +0000 |
| commit | 18ecabe4ba1290c6f0c289290933309aeff423a4 (patch) | |
| tree | 8d75491ea83a796669d8419e9a45251e1b297c86 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1d971416156d8a164d31691cbbbd43b53bdb8015 (diff) | |
| parent | 15f76355228b7aa1f48233f5aef8dccbf6fc82e7 (diff) | |
am 15f76355: (-s ours) am 7fa4d2a7: (-s ours) am f3d1f3af: (-s ours) am 5cc92074: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '15f76355228b7aa1f48233f5aef8dccbf6fc82e7':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions